diff options
Diffstat (limited to '')
| -rw-r--r-- | .github/workflows/ci.yml | 21 | ||||
| m--------- | cmake | 0 |
2 files changed, 8 insertions, 13 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b5b8ea9..0edee47 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,13 +30,13 @@ jobs: platform: [x64, x86] configuration: [Debug, RelWithDebInfo] include: - # Prettier run names. - - {os: windows-2016, toolset: msvc, name: VS 2017} - - {os: windows-2019, toolset: msvc, name: VS 2019} - - {os: ubuntu-20.04, toolset: mingw, name: MinGW} + - {os: windows-2016, toolset: msvc} + - {os: windows-2019, toolset: msvc} + - {os: ubuntu-20.04, toolset: mingw} runs-on: '${{ matrix.os }}' - name: 'Build: ${{ matrix.name }} / ${{ matrix.platform }} / ${{ matrix.configuration }}' + name: 'Build: ${{ matrix.os }} / ${{ matrix.toolset }} / ${{ matrix.platform }} / ${{ matrix.configuration }}' env: + toolset: '${{ matrix.toolset }}' platform: '${{ matrix.platform }}' configuration: '${{ matrix.configuration }}' boost_version: 1.72.0 @@ -60,21 +60,16 @@ jobs: - name: Boost (MinGW) run: | cd cmake - python -m project.ci.github.boost --toolset '${{ matrix.toolset }}' -- --with-test - echo 'BOOST_DIR=${{ runner.workspace }}\boost' >> $env:GITHUB_ENV + python -m project.ci.github.boost -- --with-test if: matrix.toolset == 'mingw' - - name: Boost (MSVC) - run: | - echo "BOOST_DIR=${env:BOOST_ROOT_1_72_0}" >> $env:GITHUB_ENV - if: matrix.toolset == 'msvc' - name: Build run: | cd cmake - python -m project.ci.github.cmake --toolset '${{ matrix.toolset }}' --boost $env:BOOST_DIR --install -- -D WINAPI_UTF8_TESTS=ON + python -m project.ci.github.cmake --install -- -D WINAPI_UTF8_TESTS=ON - name: Upload the binaries uses: actions/upload-artifact@v2 with: - name: 'winapi-utf8-${{ matrix.os }}-${{ matrix.platform }}-${{ matrix.configuration }}' + name: 'winapi-utf8-${{ matrix.os }}-${{ matrix.toolset }}-${{ matrix.platform }}-${{ matrix.configuration }}' path: '${{ runner.workspace }}/install/' - name: Run unit tests run: ../install/bin/winapi-utf8-unit-tests diff --git a/cmake b/cmake -Subproject f94b917b66deb8b6abd173547a3f36e7271f654 +Subproject d4673a2ff058529488dddf2e0520ee68ec88a0c |