aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.github/workflows/ci.yml17
m---------cmake0
2 files changed, 9 insertions, 8 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4a2a25a..d84ed91 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, vs2019]
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: vs2019, 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-utf8-${{ matrix.os }}-${{ matrix.toolset }}-${{ matrix.platform }}-${{ matrix.configuration }}'
+ name: 'winapi-utf8-${{ 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