Commit 92b471a
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -35,21 +35,27 @@ jobs: | |||
| 35 | 35 | ||
| 36 | 36 | windows: | |
| 37 | 37 | name: "Windows" | |
| 38 | - runs-on: windows-2019 | ||
| 38 | + runs-on: ${{ matrix.os }} | ||
| 39 | + continue-on-error: ${{ matrix.experimental }} | ||
| 39 | 40 | ||
| 40 | 41 | strategy: | |
| 41 | 42 | fail-fast: false | |
| 42 | 43 | matrix: | |
| 43 | 44 | include: | |
| 44 | - - profile: MSVC2019-x64 | ||
| 45 | + - os: windows-2019 | ||
| 46 | + vcvars: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat | ||
| 47 | + experimental: false | ||
| 48 | + | ||
| 49 | + - os: windows-2022 | ||
| 50 | + vcvars: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat | ||
| 51 | + experimental: true | ||
| 45 | 52 | ||
| 46 | 53 | steps: | |
| 47 | 54 | - name: Install Qbs | |
| 48 | 55 | run: choco install qbs | |
| 49 | 56 | - name: Setup Qbs | |
| 50 | 57 | run: | | |
| 51 | - qbs setup-toolchains --detect | ||
| 52 | - qbs config --list profiles | ||
| 58 | + qbs setup-toolchains --type msvc $(cmd /c '"${{ matrix.vcvars }}" >nul & where cl') msvc | ||
| 53 | 59 | ||
| 54 | 60 | - uses: actions/checkout@v2 | |
| 55 | 61 | ||
@@ -59,6 +65,6 @@ jobs: | |||
| 59 | 65 | ||
| 60 | 66 | - name: Build and run Tests | |
| 61 | 67 | run: >- | |
| 62 | - qbs build profile:${{ matrix.profile }} | ||
| 68 | + qbs build profile:msvc | ||
| 63 | 69 | --build-directory ${env:RUNNER_TEMP}\build | |
| 64 | 70 | -p autotest-runner | |
0 commit comments