From 7bd7b1f95ed3987f85939761e9062e64dcac8923 Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Sun, 31 Jan 2021 01:15:10 +0300
Subject: update cmake-common

---
 .github/workflows/ci.yml | 21 ++++++++-------------
 cmake                    |  2 +-
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d86c7c0..de45532 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,16 +19,16 @@ jobs:
         use_asm: [1, 0]
         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}
         exclude:
           - {platform: x64, use_asm: 1}
           - {os: ubuntu-20.04, use_asm: 1}
     runs-on: '${{ matrix.os }}'
-    name: 'Build: ${{ matrix.name }} / ${{ matrix.platform }} / ASM: ${{ matrix.use_asm }} / ${{ matrix.configuration }}'
+    name: 'Build: ${{ matrix.os }} / ${{ matrix.toolset }} / ${{ matrix.platform }} / asm${{ matrix.use_asm }} / ${{ matrix.configuration }}'
     env:
+      toolset: '${{ matrix.toolset }}'
       platform: '${{ matrix.platform }}'
       configuration: '${{ matrix.configuration }}'
       boost_version: 1.72.0
@@ -52,21 +52,16 @@ jobs:
       - name: Boost (MinGW)
         run: |
           cd cmake
-          python -m project.ci.github.boost --toolset '${{ matrix.toolset }}' -- --with-filesystem --with-program_options --with-system
-          echo 'BOOST_DIR=${{ runner.workspace }}\boost' >> $env:GITHUB_ENV
+          python -m project.ci.github.boost -- --with-filesystem --with-program_options --with-system
         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 'AES_TOOLS_ASM=${{ matrix.use_asm }}'
+          python -m project.ci.github.cmake --install -- -D 'AES_TOOLS_ASM=${{ matrix.use_asm }}'
       - name: Upload the binaries
         uses: actions/upload-artifact@v2
         with:
-          name: 'aes-tools-${{ matrix.os }}-${{ matrix.platform }}-asm${{ matrix.use_asm }}-${{ matrix.configuration }}'
+          name: 'aes-tools-${{ matrix.os }}-${{ matrix.toolset }}-${{ matrix.platform }}-asm${{ matrix.use_asm }}-${{ matrix.configuration }}'
           path: '${{ runner.workspace }}/install/'
       - name: Run test/nist.py
         run: |
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