diff options
| author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2021-11-04 11:03:45 +0300 |
|---|---|---|
| committer | Hannah von Reth <vonreth@kde.org> | 2021-11-04 13:11:36 +0300 |
| commit | 4a3fe9e8bc0c8d288cede46fd7691f21dcac2320 (patch) | |
| tree | 0c26eacaecf1202686ff13b1755aa582b91bd21c | |
| parent | 660563586be154df0fe66f0517d34b9c98be67e8 (diff) | |
Ci: msvc2017 -> msvc2019
| -rw-r--r-- | .craft.ini | 11 | ||||
| -rw-r--r-- | .github/workflows/main.yml | 6 |
2 files changed, 7 insertions, 10 deletions
diff --git a/.craft.ini b/.craft.ini index 89e08be22..861a04e2e 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 a4060891a..45fe44ae1 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 |