From 4f6cc1ade97adf9e7ba7effe4b8753220a8a7697 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Fri, 26 Apr 2024 11:35:02 +0200 Subject: [PATCH] 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 --- .github/workflows/windows-build-and-test.yml | 4 ++-- craftmaster.ini | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows-build-and-test.yml b/.github/workflows/windows-build-and-test.yml index 03b9688497320..2aa869326675b 100644 --- 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 9cb7436c63d99..c3350745b1dab 100644 --- a/craftmaster.ini +++ b/craftmaster.ini @@ -57,6 +57,10 @@ 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 +82,4 @@ Compile/BuildType = Debug [Env] CRAFT_CODESIGN_CERTIFICATE = -SIGN_PACKAGE = False \ No newline at end of file +SIGN_PACKAGE = False