use windows-2022 image to run our windows CI on github actions

also switch craft to target windows-msvc2022_64-cl

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>

diff --git a/.github/workflows/windows-build-and-test.yml b/.github/workflows/windows-build-and-test.yml
index 03b968849732017cf65d27e49543a0fa456783df..2aa869326675b64a40027534669cf4a462518bb3 100644 (file)
--- a/.github/workflows/windows-build-and-test.yml
+++ b/.github/workflows/windows-build-and-test.yml
@@ -5,9 +5,9 @@ on:
 jobs:
   build:
     name: Windows Build and Test
-    runs-on: windows-2019
+    runs-on: windows-2022
     env:
-      CRAFT_TARGET: windows-msvc2019_64-cl
+      CRAFT_TARGET: windows-msvc2022_64-cl
       COBERTURA_COVERAGE_FILE: ${{ github.workspace }}\cobertura_coverage\coverage.xml
       CRAFT_MASTER_LOCATION: ${{ github.workspace }}\CraftMaster
       CRAFT_MASTER_CONFIG: ${{ github.workspace }}\craftmaster.ini

diff --git a/craftmaster.ini b/craftmaster.ini
index 9cb7436c63d99ed596c26ff53e3c6fd8cf085717..20d481eb957830dfc9d88d43969a714c9759a3bb 100644 (file)
--- a/craftmaster.ini
+++ b/craftmaster.ini
@@ -29,7 +29,7 @@ Paths/downloaddir = ${Variables:Root}\downloads
 ShortPath/Enabled = False
 ShortPath/EnableJunctions = False
 
-; Packager/RepositoryUrl = https://files.kde.org/craft/
+Packager/RepositoryUrl = https://files.kde.org/craft/Qt6
 Packager/PackageType = NullsoftInstallerPackager
 
 ContinuousIntegration/Enabled = True
@@ -42,21 +42,14 @@ Packager/UseCache = ${Variables:UseCache}
 Packager/CreateCache = ${Variables:CreateCache}
 Packager/CacheDir = ${Variables:Root}\cache
 
-#CodeSigning/Enabled = ${Env:SIGN_PACKAGE}
-#CodeSigning/Protected = True
-#CodeSigning/Certificate = ${Env:CRAFT_CODESIGN_CERTIFICATE}
-#CodeSigning/CommonName =
-#CodeSigning/MacDeveloperId = ownCloud GmbH (4AP2STM4H5)
-#CodeSigning/MacKeychainPath = sign-${Env:DRONE_BUILD_NUMBER}.keychain
-
 [BlueprintSettings]
-# don't try to pip install on the ci
-python-modules.ignored = True
-dev-utils/python2.ignored = True
-dev-utils/python3.ignored = True
 nextcloud-client.buildTests = True
 binary/mysql.useMariaDB = False
 
+[windows-msvc2022_64-cl]
+QtSDK/Compiler = msvc2022_64
+General/ABI = windows-msvc2022_64-cl
+
 [windows-msvc2019_64-cl]
 QtSDK/Compiler = msvc2019_64
 General/ABI = windows-msvc2019_64-cl
@@ -78,4 +71,4 @@ Compile/BuildType = Debug
 
 [Env]
 CRAFT_CODESIGN_CERTIFICATE =
-SIGN_PACKAGE = False
\ No newline at end of file
+SIGN_PACKAGE = False