From e6cdd2f44fd6cf0056a1016562ffdc434d2b287b Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sat, 8 May 2021 14:38:38 +0300 Subject: workflows/ci: build using VS 2015 also --- .github/workflows/ci.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4f7a09b..454d369 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,17 +24,18 @@ jobs: build: strategy: matrix: - # MinGW builds are done on Linux, since it's more up-to-date there, and - # it's much faster. - os: [ubuntu-20.04, windows-2016, windows-2019] + toolset: [mingw, vs2015, vs2017, vs] platform: [x64, x86] configuration: [Debug, RelWithDebInfo] include: - - {os: windows-2016, toolset: msvc} - - {os: windows-2019, toolset: msvc} - - {os: ubuntu-20.04, toolset: mingw} + # MinGW builds are done on Linux, since it's more up-to-date there, + # and it's much faster. + - {toolset: mingw, os: ubuntu-20.04} + - {toolset: vs2015, os: windows-2016} + - {toolset: vs2017, os: windows-2016} + - {toolset: vs, os: windows-2019} runs-on: '${{ matrix.os }}' - name: 'Build: ${{ matrix.os }} / ${{ matrix.toolset }} / ${{ matrix.platform }} / ${{ matrix.configuration }}' + name: 'Build: ${{ matrix.toolset }} / ${{ matrix.platform }} / ${{ matrix.configuration }}' defaults: run: shell: pwsh @@ -68,7 +69,7 @@ jobs: - name: Upload binaries uses: actions/upload-artifact@v2 with: - name: 'winapi-common-${{ matrix.os }}-${{ matrix.toolset }}-${{ matrix.platform }}-${{ matrix.configuration }}' + name: 'winapi-common-${{ matrix.toolset }}-${{ matrix.platform }}-${{ matrix.configuration }}' path: '${{ runner.workspace }}/build/install/' if-no-files-found: error - name: Test @@ -77,7 +78,7 @@ jobs: - name: Upload test logs uses: actions/upload-artifact@v2 with: - name: 'test_logs-${{ matrix.os }}-${{ matrix.platform }}-${{ matrix.configuration }}' + name: 'test_logs-${{ matrix.toolset }}-${{ matrix.platform }}-${{ matrix.configuration }}' path: | ${{ runner.workspace }}/build/**/*_tests.log ${{ runner.workspace }}/build/**/*_report.txt -- cgit v1.2.3