Clean up Github Action config

Author: jimporter

.github/workflows/build.yml

@@ -15,21 +15,21 @@ jobs:
       matrix:
         include:
           # GCC builds
-          - {os: ubuntu-latest, compiler: gcc,   version:  '7',
+          - {os: ubuntu-latest, compiler: gcc, version:  '7',
              flags: '-Wsuggest-override'}
-          - {os: ubuntu-latest, compiler: gcc,   version:  '8',
+          - {os: ubuntu-latest, compiler: gcc, version:  '8',
              flags: '-Wsuggest-override'}
-          - {os: ubuntu-latest, compiler: gcc,   version:  '9',
+          - {os: ubuntu-latest, compiler: gcc, version:  '9',
              flags: '-Wsuggest-override'}
-          - {os: ubuntu-latest, compiler: gcc,   version: '10',
+          - {os: ubuntu-latest, compiler: gcc, version: '10',
              flags: '-Wsuggest-override'}
 
           # Clang builds
           - {os: ubuntu-latest, compiler: clang, version:  '6.0'}
           - {os: ubuntu-latest, compiler: clang, version:  '7'}
           - {os: ubuntu-latest, compiler: clang, version:  '8'}
           - {os: ubuntu-latest, compiler: clang, version:  '9'}
-          - {os: ubuntu-latest, compiler: clang, version:  '10'}
+          - {os: ubuntu-latest, compiler: clang, version: '10'}
 
           # Windows builds
           - {os: windows-latest, version: '14.1', boost: '1_69_0'}
@@ -39,7 +39,7 @@ jobs:
           - {os: macos-latest}
 
           # C++20 builds
-          - {os: ubuntu-latest, compiler: gcc,   version: '10',
+          - {os: ubuntu-latest, compiler: gcc, version: '10',
              flags: '--std=c++2a -Wsuggest-override'}
           - {os: ubuntu-latest, compiler: clang, version:  '10',
              flags: '--std=c++2a'}
@@ -62,10 +62,10 @@ jobs:
       if: matrix.os == 'windows-latest'
       run: |
         cinst ninja
-        $gnomebase = "https://ftp.gnome.org/pub/gnome/binaries/win32"
-        curl -LO $gnomebase/dependencies/pkg-config_0.26-1_win32.zip
-        curl -LO $gnomebase/glib/2.28/glib_2.28.8-1_win32.zip
-        curl -LO $gnomebase/dependencies/gettext-runtime_0.18.1.1-2_win32.zip
+        ${gnomebase} = "https://ftp.gnome.org/pub/gnome/binaries/win32"
+        curl -LO ${gnomebase}/dependencies/pkg-config_0.26-1_win32.zip
+        curl -LO ${gnomebase}/glib/2.28/glib_2.28.8-1_win32.zip
+        curl -LO ${gnomebase}/dependencies/gettext-runtime_0.18.1.1-2_win32.zip
         7z x -y pkg-config_0.26-1_win32.zip -oC:\pkg-config
         7z x -y glib_2.28.8-1_win32.zip -oC:\pkg-config
         7z x -y gettext-runtime_0.18.1.1-2_win32.zip -oC:\pkg-config
@@ -112,6 +112,7 @@ jobs:
         echo "PATH=${HOME}/bin:${PATH}" >> ${GITHUB_ENV}
         echo "CPATH=${HOME}/include" >> ${GITHUB_ENV}
         echo "PKG_CONFIG_PATH=${HOME}/lib/pkgconfig" >> ${GITHUB_ENV}
+        echo "CXXFLAGS=${COMMONFLAGS} ${{ matrix.flags }}" >> ${GITHUB_ENV}
     - name: Build mettle (Windows)
       if: matrix.os == 'windows-latest'
       run: |
@@ -124,16 +125,9 @@ jobs:
         echo "PATH=${env:HOME}\mettle;${env:PATH}" >> ${env:GITHUB_ENV}
         echo "CPATH=${env:HOME}\mettle" >> ${env:GITHUB_ENV}
         echo "PKG_CONFIG_PATH=${env:HOME}\mettle\pkgconfig" >> ${env:GITHUB_ENV}
+        echo "CXXFLAGS=/WX ${{ matrix.flags }}" >> ${env:GITHUB_ENV}
     - name: Run tests
-      if: matrix.os != 'windows-latest'
-      run: |
-        CXXFLAGS="${COMMONFLAGS} ${{ matrix.flags }}" 9k build --backend=ninja
-        cd build
-        ninja test
-    - name: Run tests (Windows)
-      if: matrix.os == 'windows-latest'
       run: |
-        ${env:CXXFLAGS} = "/WX ${{ matrix.flags }}"
         9k build --backend=ninja
         cd build
         ninja test