From 16e529deca190d92a01940954f0d333494ebe413 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sun, 31 Jan 2021 01:47:33 +0300 Subject: update cmake-common --- .github/workflows/ci.yml | 15 +++++++-------- cmake | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5460315..bcda244 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,16 +18,15 @@ jobs: platform: [x64, x86] configuration: [Debug, Release] 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.65.0 defaults: run: shell: pwsh @@ -48,9 +47,9 @@ jobs: - name: Build run: | cd cmake - python -m project.ci.github.cmake --toolset '${{ matrix.toolset }}' --install + python -m project.ci.github.cmake --install - name: Upload the binaries uses: actions/upload-artifact@v2 with: - name: 'pdb-repo-${{ matrix.os }}-${{ matrix.platform }}-${{ matrix.configuration }}' + name: 'pdb-repo-${{ matrix.os }}-${{ matrix.toolset }}-${{ matrix.platform }}-${{ matrix.configuration }}' path: '${{ runner.workspace }}/install/' diff --git a/cmake b/cmake index f94b917..d4673a2 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit f94b917b66deb8b6abd173547a3f36e7271f6549 +Subproject commit d4673a2ff058529488dddf2e0520ee68ec88a0c7 -- cgit v1.2.3