From 063d55c55880f7a1978e544b9a490e7774e5e06f Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@gmail.com>
Date: Fri, 20 Nov 2020 02:24:43 +0200
Subject: [PATCH] Use matrix.install for the apt package

---
 .github/workflows/ci.yml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3388c11..344da48 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,18 +16,22 @@ jobs:
           - toolset: gcc-4.7
             cxxstd: "03,11"
             os: ubuntu-16.04
+            install: g++-4.7
           - toolset: gcc-4.8
             cxxstd: "03,11"
             os: ubuntu-16.04
+            install: g++-4.8
           - toolset: gcc-4.9
             cxxstd: "03,11"
             os: ubuntu-16.04
+            install: g++-4.9
           - toolset: gcc-5
             cxxstd: "03,11,14,1z"
             os: ubuntu-16.04
           - toolset: gcc-6
             cxxstd: "03,11,14,1z"
             os: ubuntu-16.04
+            install: g++-6
           - toolset: gcc-7
             cxxstd: "03,11,14,17"
             os: ubuntu-18.04
@@ -58,7 +62,11 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Setup (POSIX)
+      - name: Install packages
+        if: matrix.install
+        run: sudo apt install ${{matrix.install}}
+
+      - name: Setup Boost (POSIX)
         if: "!startsWith( matrix.os, 'windows-' )"
         run: |
           REF=${GITHUB_BASE_REF:-$GITHUB_REF}
@@ -72,11 +80,7 @@ jobs:
           ./bootstrap.sh
           ./b2 -d0 headers
 
-      - name: Install GCC
-        if: "matrix.toolset == 'gcc-6' || startsWith( matrix.toolset, 'gcc-4.' )"
-        run: sudo apt install ${{matrix.toolset}}
-
-      - name: Setup (Windows)
+      - name: Setup Boost (Windows)
         if: "startsWith( matrix.os, 'windows-' )"
         shell: cmd
         run: |