Skip to content

Commit

Permalink
use windows-2022 image to run our windows CI on github actions
Browse files Browse the repository at this point in the history
also switch craft to target windows-msvc2022_64-cl

Signed-off-by: Matthieu Gallien <[email protected]>
  • Loading branch information
mgallien committed Apr 26, 2024
1 parent 810d8f1 commit de002fb
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/windows-build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 6 additions & 2 deletions craftmaster.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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/24.04/windows/cl/msvc2022/x86_64/RelWithDebInfo/
Packager/PackageType = NullsoftInstallerPackager

ContinuousIntegration/Enabled = True
Expand Down Expand Up @@ -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
Expand All @@ -78,4 +82,4 @@ Compile/BuildType = Debug

[Env]
CRAFT_CODESIGN_CERTIFICATE =
SIGN_PACKAGE = False
SIGN_PACKAGE = False

0 comments on commit de002fb

Please sign in to comment.