From d3b9f66f68fe0700c2610e297e7d382d7adc925c Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Sat, 8 May 2021 02:11:32 +0300
Subject: workflows: lint, tweak job names, etc.

---
 .github/workflows/basic.yml | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

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

diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml
index bfb6212..c56bd9c 100644
--- a/.github/workflows/basic.yml
+++ b/.github/workflows/basic.yml
@@ -21,14 +21,11 @@ jobs:
   basic:
     strategy:
       matrix:
-        os: [ubuntu-18.04, windows-2016, windows-2019]
+        os: [ubuntu-20.04, windows-2016, windows-2019]
         include:
-          # Prettier run names.
-          - {os: windows-2016, name: VS 2017}
-          - {os: windows-2019, name: VS 2019}
-          - {os: ubuntu-18.04, name: Ubuntu}
+          - boost-version: 1.72.0
     runs-on: '${{ matrix.os }}'
-    name: '${{ matrix.name }}'
+    name: 'Build: ${{ matrix.os }}'
     defaults:
       run:
         shell: pwsh
@@ -37,21 +34,19 @@ jobs:
         uses: actions/checkout@v2
       - name: Set up Python
         uses: actions/setup-python@v2
-        with:
-          python-version: '3.x'
       - name: Cache Boost
         uses: actions/cache@v2
         with:
           path: boost_*.tar.gz
-          key: boost_1.72.0
+          key: 'boost_${{ matrix.boost-version }}'
       - name: Build Boost
         run: |
-          python -m project.boost.download --cache . 1.72.0
-          python -m project.boost.build -- boost_1_72_0 --with-filesystem
+          python -m project.boost.download --cache . '${{ matrix.boost-version }}' boost
+          python -m project.boost.build -- boost --with-filesystem
       - name: Build example project
         run: |
           $src_dir = Join-Path examples boost
-          python -m project.cmake.build --boost boost_1_72_0 --install install -- $src_dir
+          python -m project.cmake.build --boost boost --install install -- $src_dir
       - name: Run example project
         run: ./.ci/run_foo.ps1 (Join-Path (Get-Location).Path install bin foo)
 
@@ -65,8 +60,6 @@ jobs:
         uses: actions/checkout@v2
       - name: Set up Python
         uses: actions/setup-python@v2
-        with:
-          python-version: 3
       - name: Verify package can be installed
         run: python3 -m pip install .
       - name: Install package builder
-- 
cgit v1.2.3