From 5c02449c11ff50e3808d12e5241f03a8bf886477 Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Wed, 24 Mar 2021 19:20:38 +0300
Subject: update cmake-common

GitHub Actions workers no longer have pre-built Boost.
---
 .github/workflows/ci.yml | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to '.github/workflows/ci.yml')

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0edee47..5f990dd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,10 +36,10 @@ jobs:
     runs-on: '${{ matrix.os }}'
     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
+      TOOLSET: '${{ matrix.toolset }}'
+      PLATFORM: '${{ matrix.platform }}'
+      CONFIGURATION: '${{ matrix.configuration }}'
+      BOOST_VERSION: 1.72.0
     defaults:
       run:
         shell: pwsh
@@ -57,20 +57,19 @@ jobs:
         with:
           platform: '${{ matrix.platform }}'
         if: matrix.toolset == 'mingw'
-      - name: Boost (MinGW)
+      - name: Build Boost
         run: |
           cd cmake
-          python -m project.ci.github.boost -- --with-test
-        if: matrix.toolset == 'mingw'
+          python -m project.ci.boost -- --with-test
       - name: Build
         run: |
           cd cmake
-          python -m project.ci.github.cmake --install -- -D WINAPI_UTF8_TESTS=ON
-      - name: Upload the binaries
+          python -m project.ci.cmake --install -- -D WINAPI_UTF8_TESTS=ON
+      - name: Upload binaries
         uses: actions/upload-artifact@v2
         with:
           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
+          path: '${{ runner.workspace }}/build/install/'
+      - name: Test
+        run: ../build/install/bin/winapi-utf8-unit-tests
         if: runner.os == 'Windows'
-- 
cgit v1.2.3