Skip to content
Merged
Changes from all commits
Commits
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
19 changes: 7 additions & 12 deletions craftmaster.ini
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: GPL-2.0-or-later
[General]
Branch = stable-34.0-qt-6.10.2
Branch = stable-35.0-qt-6.11.2
CraftUrl = https://github.com/nextcloud/craft.git
CraftRevision = 6d812696a6aa025dc3c545d8feb954f23be9446e
CraftRevision = afe89f26d42a4df844b835f0f9615a9b8c0088b9
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 = stable-34.0-qt-6.10.2
Packager/CacheVersion = stable-35.0-qt-6.11.2
ContinuousIntegration/Enabled = True

Packager/UseCache = ${Variables:UseCache}
Expand All @@ -39,11 +39,9 @@ Packager/CacheDir = ${Variables:Root}\cache
nextcloud-client.buildTests = True
nextcloud-client.buildWithWebEngine = False
binary/mysql.useMariaDB = False
libs/qt6.version = 6.10.2
craft/craft-blueprints-kde.revision = stable-34.0
craft/craft-blueprints-nextcloud.revision = stable-34.0
libs/zlib.version = 1.3.1
libs/openssl.version = 3.6.3
libs/qt6.version = 6.11.2
craft/craft-blueprints-kde.revision = stable-35.0
craft/craft-blueprints-nextcloud.revision = stable-35.0

[windows-msvc2022_64-cl]
Packager/PackageType = NullsoftInstallerPackager
Expand All @@ -60,14 +58,11 @@ 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
Packager/RepositoryUrl = https://files.kde.org/craft/Qt6/
Packager/CacheVersion = 26.02

[Env]
CRAFT_CODESIGN_CERTIFICATE =
SIGN_PACKAGE = False

[Custom_Variables_for_Brander]
qtPath = /root/linux-gcc-x86_64
dockerImage = ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-el8-6.10.2-4
dockerImage = ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-el8-6.11.2-1
Loading