diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2021-05-08 13:15:53 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2021-05-08 14:55:40 +0300 |
| commit | e782dcdbe31f5120958f73826e952a8f87a7c58a (patch) | |
| tree | c298fb0ca88c40059d26f06c5c57c97878c3f7a5 | |
| parent | workflows/ci: remove redundant parameter (diff) | |
| download | math-server-e782dcdbe31f5120958f73826e952a8f87a7c58a.tar.gz math-server-e782dcdbe31f5120958f73826e952a8f87a7c58a.zip | |
workflows/ci: in terms of toolsets, not runner images
| -rw-r--r-- | .github/workflows/ci.yml | 14 | ||||
| m--------- | cmake | 0 |
2 files changed, 7 insertions, 7 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fa61f6c..43b3229 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,18 +24,18 @@ jobs: build: strategy: matrix: - os: [ubuntu-20.04, windows-2016, windows-2019] + toolset: [gcc, vs2017, vs2019] platform: [x64, x86] configuration: [Debug, Release] include: - - {os: windows-2016, toolset: msvc} - - {os: windows-2019, toolset: msvc} - - {os: ubuntu-20.04, toolset: gcc} + - {toolset: gcc, os: ubuntu-20.04} + - {toolset: vs2017, os: windows-2016} + - {toolset: vs2019, os: windows-2019} exclude: # 32-bit Linux builds, meh. - - {os: ubuntu-20.04, platform: x86} + - {toolset: gcc, platform: x86} runs-on: '${{ matrix.os }}' - name: 'Build: ${{ matrix.os }} / ${{ matrix.toolset }} / ${{ matrix.platform }} / ${{ matrix.configuration }}' + name: 'Build: ${{ matrix.toolset }} / ${{ matrix.platform }} / ${{ matrix.configuration }}' env: TOOLSET: '${{ matrix.toolset }}' PLATFORM: '${{ matrix.platform }}' @@ -64,7 +64,7 @@ jobs: - name: Upload binaries uses: actions/upload-artifact@v2 with: - name: 'math-server-${{ matrix.os }}-${{ matrix.toolset }}-${{ matrix.platform }}-${{ matrix.configuration }}' + name: 'math-server-${{ matrix.toolset }}-${{ matrix.platform }}-${{ matrix.configuration }}' path: '${{ runner.workspace }}/build/install/' if-no-files-found: error - name: Test diff --git a/cmake b/cmake -Subproject 6f14c394ad8701d3c74692cf0bf9a5034c82de2 +Subproject f12965b98ab7f3ceda8c123823e17ad3e6751ed |