From 2dc61cfb40eb6278f6dad41568960cabac200eee Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Thu, 6 Feb 2025 14:32:17 +0800 Subject: [PATCH 1/3] craft: Only set NSIS package type with windows Signed-off-by: Claudio Cambra --- craftmaster.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/craftmaster.ini b/craftmaster.ini index 6e033fc2c5e33..2eeae85daae93 100644 --- a/craftmaster.ini +++ b/craftmaster.ini @@ -25,7 +25,6 @@ ShortPath/Enabled = False ShortPath/EnableJunctions = False Packager/RepositoryUrl = https://files.kde.org/craft/Qt6 -Packager/PackageType = NullsoftInstallerPackager Packager/CacheVersion = 24.10 ContinuousIntegration/Enabled = True @@ -44,6 +43,7 @@ binary/mysql.useMariaDB = False libs/qt6.version = 6.8.0 [windows-msvc2022_64-cl] +Packager/PackageType = NullsoftInstallerPackager QtSDK/Compiler = msvc2022_64 General/ABI = windows-msvc2022_64-cl Paths/Python = C:\Python312-x64 From b6f54679c8be637040954703623e60b8bd09c058 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Thu, 6 Feb 2025 14:32:44 +0800 Subject: [PATCH 2/3] craft: Upgrade to binary cache 25.01 and Qt version 6.8.1 Signed-off-by: Claudio Cambra --- craftmaster.ini | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/craftmaster.ini b/craftmaster.ini index 2eeae85daae93..6b716976855fd 100644 --- a/craftmaster.ini +++ b/craftmaster.ini @@ -25,8 +25,7 @@ ShortPath/Enabled = False ShortPath/EnableJunctions = False Packager/RepositoryUrl = https://files.kde.org/craft/Qt6 -Packager/CacheVersion = 24.10 - +Packager/CacheVersion = 25.01 ContinuousIntegration/Enabled = True ## This option can be used to override the default make program @@ -40,7 +39,7 @@ Packager/CacheDir = ${Variables:Root}\cache [BlueprintSettings] nextcloud-client.buildTests = True binary/mysql.useMariaDB = False -libs/qt6.version = 6.8.0 +libs/qt6.version = 6.8.1 [windows-msvc2022_64-cl] Packager/PackageType = NullsoftInstallerPackager From 3809fb1813a17d25a876d2a63917fb76644e6507 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Thu, 6 Feb 2025 14:33:30 +0800 Subject: [PATCH 3/3] craft: Clean up ini file Signed-off-by: Claudio Cambra --- craftmaster.ini | 5 ----- 1 file changed, 5 deletions(-) diff --git a/craftmaster.ini b/craftmaster.ini index 6b716976855fd..c89e6b7689d5c 100644 --- a/craftmaster.ini +++ b/craftmaster.ini @@ -24,14 +24,9 @@ Compile/UseNinja = True ShortPath/Enabled = False ShortPath/EnableJunctions = False -Packager/RepositoryUrl = https://files.kde.org/craft/Qt6 Packager/CacheVersion = 25.01 ContinuousIntegration/Enabled = True -## This option can be used to override the default make program -## change the value to the path of the executable you want to use instead. -Compile/MakeProgram = jom - Packager/UseCache = ${Variables:UseCache} Packager/CreateCache = ${Variables:CreateCache} Packager/CacheDir = ${Variables:Root}\cache