Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: use default cache path for squish craft target instead of separate squish path #12025

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

saw-jan
Copy link
Member

@saw-jan saw-jan commented Dec 31, 2024

By using the following as a cache path for inux-gcc-x86_64-squish craft target, we can separately define which Qt version to use for this target and we also omit the necessity of creating separate squish cache path

Packager/CacheVersion = ${Variables:ownCloudVersion}/Qt_${linux-gcc-x86_64-squish-BlueprintSettings:libs/qt6.version}_${Variables:CachePatchLvl}

This targets the linux cache folder of defined Qt version for libraries and we no longer require squish cache folder

@saw-jan saw-jan self-assigned this Dec 31, 2024
@saw-jan
Copy link
Member Author

saw-jan commented Dec 31, 2024

@DeepDiver1975 Could you check if this is valid and doesn't affect anything else?
I tested with craft and the the libraries are downloaded from the correct cache path

If we merge this then we can also remove these:

https://gitea.owncloud.services/client/build-craft-cache/src/commit/df5426a4b3d7c2c4f28e288a398366eda9feb17b/.drone.star#L10

This also?: https://gitea.owncloud.services/client/build-craft-cache/src/commit/df5426a4b3d7c2c4f28e288a398366eda9feb17b/craft_override.ini#L24-L32

@saw-jan saw-jan force-pushed the build/squish-cache-path branch from 02a4c37 to 0611a4b Compare January 21, 2025 04:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant