From 18f5ba735d462e94c89a0dd4ea7bc35e21ca86e6 Mon Sep 17 00:00:00 2001 From: Rello Date: Wed, 15 Jan 2025 12:35:57 +0100 Subject: [PATCH 1/3] Update craftmaster.ini Signed-off-by: Rello --- craftmaster.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/craftmaster.ini b/craftmaster.ini index 35e6d81695d7e..052e1137da1a8 100644 --- a/craftmaster.ini +++ b/craftmaster.ini @@ -58,3 +58,7 @@ Paths/Python = /Users/runner/hostedtoolcache/Python/3.12.3/arm64 [Env] CRAFT_CODESIGN_CERTIFICATE = SIGN_PACKAGE = False + +[Custom_Variables_for_Brander] +qtPath = /opt/qt6.7.3 +dockerImage = ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-6.7.3-1 From dc6ed4dc94ae73d425b2d70a903d99a20bbf781f Mon Sep 17 00:00:00 2001 From: Rello Date: Wed, 15 Jan 2025 13:30:02 +0100 Subject: [PATCH 2/3] Update VERSION.cmake Signed-off-by: Rello --- VERSION.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/VERSION.cmake b/VERSION.cmake index 65738aa07a6f9..2acfd5ad417b1 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -38,4 +38,5 @@ if( MIRALL_VERSION_BUILD ) set( MIRALL_VERSION_STRING "${MIRALL_VERSION_STRING} (build ${MIRALL_VERSION_BUILD})" ) endif( MIRALL_VERSION_BUILD ) +# not used anymore. For brander, please maintain craftmaster.ini set(QT_MAJOR_VERSION 6) From b6d3ecb14ce21a519d6e29038f1ec3e38cd47e4e Mon Sep 17 00:00:00 2001 From: Rello Date: Wed, 22 Jan 2025 13:15:12 +0100 Subject: [PATCH 3/3] Update craftmaster.ini Co-authored-by: Jyrki Gadinger Signed-off-by: Rello --- craftmaster.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/craftmaster.ini b/craftmaster.ini index 052e1137da1a8..392b557e75244 100644 --- a/craftmaster.ini +++ b/craftmaster.ini @@ -60,5 +60,5 @@ CRAFT_CODESIGN_CERTIFICATE = SIGN_PACKAGE = False [Custom_Variables_for_Brander] -qtPath = /opt/qt6.7.3 -dockerImage = ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-6.7.3-1 +qtPath = /opt/qt +dockerImage = ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-6.8.1-1