diff options
Diffstat (limited to '')
| -rw-r--r-- | .github/workflows/ci.yml | 19 | ||||
| m--------- | cmake | 0 |
2 files changed, 10 insertions, 9 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bfc5017..786998c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,21 +12,22 @@ 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, vs2019] platform: [x64, x86] use_asm: [1, 0] configuration: [Debug, Release] 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: vs2019, os: windows-2019} exclude: - {platform: x64, use_asm: 1} - - {os: ubuntu-20.04, use_asm: 1} + - {toolset: mingw, use_asm: 1} runs-on: '${{ matrix.os }}' - name: 'Build: ${{ matrix.os }} / ${{ matrix.toolset }} / ${{ matrix.platform }} / asm${{ matrix.use_asm }} / ${{ matrix.configuration }}' + name: 'Build: ${{ matrix.toolset }} / ${{ matrix.platform }} / asm${{ matrix.use_asm }} / ${{ matrix.configuration }}' env: TOOLSET: '${{ matrix.toolset }}' PLATFORM: '${{ matrix.platform }}' @@ -60,7 +61,7 @@ jobs: - name: Upload binaries uses: actions/upload-artifact@v2 with: - name: 'aes-tools-${{ matrix.os }}-${{ matrix.toolset }}-${{ matrix.platform }}-asm${{ matrix.use_asm }}-${{ matrix.configuration }}' + name: 'aes-tools-${{ matrix.toolset }}-${{ matrix.platform }}-asm${{ matrix.use_asm }}-${{ matrix.configuration }}' path: '${{ runner.workspace }}/build/install/' if-no-files-found: error - name: Test diff --git a/cmake b/cmake -Subproject 6f14c394ad8701d3c74692cf0bf9a5034c82de2 +Subproject f12965b98ab7f3ceda8c123823e17ad3e6751ed |