Skip to content

Commit

Permalink
Ci: msvc2017 -> msvc2019
Browse files Browse the repository at this point in the history
  • Loading branch information
TheOneRing committed Nov 4, 2021
1 parent 6605635 commit 4a3fe9e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
11 changes: 4 additions & 7 deletions .craft.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 4a3fe9e

Please sign in to comment.