From 4a3fe9e8bc0c8d288cede46fd7691f21dcac2320 Mon Sep 17 00:00:00 2001 From: Hannah von Reth Date: Thu, 4 Nov 2021 09:03:45 +0100 Subject: [PATCH] Ci: msvc2017 -> msvc2019 --- .craft.ini | 11 ++++------- .github/workflows/main.yml | 6 +++--- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.craft.ini b/.craft.ini index 89e08be22a5..861a04e2ecf 100644 --- a/.craft.ini +++ b/.craft.ini @@ -72,15 +72,12 @@ libs/qt5/qtbase.withDBus = False [windows-msvc2019_64-cl] General/ABI = windows-msvc2019_64-cl -[windows-msvc2017_64-cl] -General/ABI = windows-msvc2017_64-cl - -[windows-msvc2017_64-cl-debug] -General/ABI = windows-msvc2017_64-cl +[windows-msvc2019_64-cl-debug] +General/ABI = windows-msvc2019_64-cl Compile/BuildType = Debug -[windows-msvc2017_32-cl] -General/ABI = windows-msvc2017_32-cl +[windows-msvc2019_32-cl] +General/ABI = windows-msvc2019_32-cl [macos-64-clang] General/ABI = macos-64-clang diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a4060891a1b..45fe44ae1b4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: include: - - target: windows-msvc2017_64-cl + - target: windows-msvc2019_64-cl os: windows-latest fetch-depth: 0 container: @@ -79,7 +79,7 @@ jobs: - name: Build run: | - if ("${{ matrix.target }}" -eq "windows-msvc2017_64-cl") { + if ("${{ matrix.target }}" -eq "windows-msvc2019_64-cl") { & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --no-cache --src-dir "${env:GITHUB_WORKSPACE}" --configure owncloud/owncloud-client $env:BUILD_DIR = $(& "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --get buildDir -q owncloud-client) & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --run pwsh "${env:GITHUB_WORKSPACE}/.github/workflows/.sonar.ps1" --build @@ -93,7 +93,7 @@ jobs: & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --no-cache --src-dir "${env:GITHUB_WORKSPACE}" --test owncloud/owncloud-client - name: Sonarcloud - if: ${{ matrix.target == 'windows-msvc2017_64-cl' }} + if: ${{ matrix.target == 'windows-msvc2019_64-cl' }} run: | $env:BUILD_DIR = $(& "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --get buildDir -q owncloud-client) & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --run pwsh "${env:GITHUB_WORKSPACE}/.github/workflows/.sonar.ps1" --analyze