Skip to content

[stable-4.0] Feat/new craft cache #9297

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.

Sign up for GitHub

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

Merged
mgallien merged 5 commits into from
Jan 9, 2026
Merged

[stable-4.0] Feat/new craft cache #9297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7fe34a7
feat(craft): update craft commit that we are using
mgallien Dec 17, 2025
dcf5997
feat(craft): select Qt 6.10.1 to build desktop client
mgallien Dec 17, 2025
c3943a0
chore: use Qt 6.9.3
mgallien Dec 19, 2025
9fc7790
feat(craft): makes use of the new stable 4.0 craft cache
mgallien Jan 5, 2026
345e223
feat(craft): add craftmaster target for linux amd64 gcc ABI
mgallien Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/windows-build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ jobs:
if($LASTEXITCODE -ne 0) {exit $LASTEXITCODE}
}

craft --add-blueprint-repository "https://github.com/nextcloud/craft-blueprints-kde.git|next|"
craft --add-blueprint-repository "https://github.com/nextcloud/desktop-client-blueprints.git|next|"
craft --add-blueprint-repository "https://github.com/nextcloud/craft-blueprints-kde.git|stable-4.0|"
craft --add-blueprint-repository "https://github.com/nextcloud/desktop-client-blueprints.git|stable-4.0|"
craft craft
craft --install-deps nextcloud-client

Expand Down
12 changes: 8 additions & 4 deletions craftmaster.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[General]
Branch = master
# CraftUrl = https://github.com/allexzander/craft.git
CraftRevision = 62325d3f1bdbb5232812da2f976147afc4fff390
CraftRevision = 05fc0f0e7cb6cb5e8ee7eccba400ad4a2b590657
ShallowClone = False

# Variables defined here override the default value
Expand All @@ -28,7 +28,7 @@ ShortPath/Enabled = False
ShortPath/EnableJunctions = False

Packager/RepositoryUrl = https://download.nextcloud.com/desktop/development/craftCache/
Packager/CacheVersion = next
Packager/CacheVersion = stable-4.0-qt-6.9.3
ContinuousIntegration/Enabled = True

Packager/UseCache = ${Variables:UseCache}
Expand All @@ -38,8 +38,8 @@ Packager/CacheDir = ${Variables:Root}\cache
[BlueprintSettings]
nextcloud-client.buildTests = True
binary/mysql.useMariaDB = False
libs/qt6.version = 6.9.2
craft/craft-blueprints-kde.revision = next
libs/qt6.version = 6.9.3
craft/craft-blueprints-kde.revision = stable-4.0

[windows-msvc2022_64-cl]
Packager/PackageType = NullsoftInstallerPackager
Expand All @@ -54,6 +54,10 @@ General/ABI = macos-64-clang
General/ABI = macos-clang-arm64
Paths/Python = /Users/runner/hostedtoolcache/Python/3.12.3/arm64

[linux-gcc-x86_64]
General/ABI = linux-gcc-x86_64
Paths/Python = /usr/bin/python3

[Env]
CRAFT_CODESIGN_CERTIFICATE =
SIGN_PACKAGE = False
Expand Down
Loading