build.yml: Update g++-11 to g++

NeilJustice · Jan 8, 2025 · e3ea363 · e3ea363
1 parent 8f450d8
commit e3ea363
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,7 +5,7 @@ jobs:
   build:
     strategy:
       matrix:
-         cxx: [clang++, g++-11]
+         cxx: [clang++, g++]
          cmake_build_type: [Debug, Release]
 
     runs-on: ubuntu-latest
@@ -27,9 +27,9 @@ jobs:
       - name: Install lld and ninja-build
         run: sudo apt-get install lld ninja-build
 
-      - name: Install lcov Perl dependencies if g++-11 Release
+      - name: Install lcov Perl dependencies if g++ Release
         run: sudo apt-get install libcapture-tiny-perl libdatetime-perl
-        if: ${{ matrix.cxx == 'g++-11' && matrix.cmake_build_type == 'Release' }}
+        if: ${{ matrix.cxx == 'g++' && matrix.cmake_build_type == 'Release' }}
 
       - name: Download ZenUnit.h
         run: curl https://raw.githubusercontent.com/NeilJustice/ZenUnitAndMetalMock/main/ZenUnitAndMetalMock/ZenUnit.h --create-dirs -o "$GITHUB_WORKSPACE/ZenUnitAndMetalMock/ZenUnit.h"
@@ -40,21 +40,21 @@ jobs:
       - name: Install pip packages
         run: pip install --upgrade --upgrade-strategy eager -r dev-requirements.txt
 
-      - name: Mypy, Flake8, Pylint, then run unit tests with coverage and pytest if g++-11 Release
+      - name: Mypy, Flake8, Pylint, then run unit tests with coverage and pytest if g++ Release
         run: python FileArbDevOpsPython/MypyFlake8PylintThenRunTestsWithCoverage.py --run-tests-with-coverage-python-file=FileArbDevOpsPythonTests/RunAllWithCoverage.py
         env:
           PYTHONPATH: "."
-        if: ${{ matrix.cxx == 'g++-11' && matrix.cmake_build_type == 'Release' }}
+        if: ${{ matrix.cxx == 'g++' && matrix.cmake_build_type == 'Release' }}
 
-      - name: Upload Python code coverage if g++-11 Release
+      - name: Upload Python code coverage if g++ Release
         uses: codecov/codecov-action@v5
         with:
           files: FileArbDevOpsPythonTests/CoberturaCodeCoverageResults_FileArbDevOpsPythonTests.xml
           fail_ci_if_error: true
           token: ${{ secrets.CODECOV_TOKEN }}
-        if: ${{ matrix.cxx == 'g++-11' && matrix.cmake_build_type == 'Release' }}
+        if: ${{ matrix.cxx == 'g++' && matrix.cmake_build_type == 'Release' }}
 
-      - name: Run BuildAndInstallCPlusPlusProgram.py in non code coverage mode if clang++ Debug/Release or g++-11 Debug
+      - name: Run BuildAndInstallCPlusPlusProgram.py in non code coverage mode if clang++ Debug/Release or g++ Debug
         run: |
            python FileArbDevOpsPython/BuildAndInstallCPlusPlusProgram.py \
               --solution-name=FileArb \
@@ -66,9 +66,9 @@ jobs:
         env:
           CXX: "/usr/bin/${{ matrix.cxx }}"
           PYTHONPATH: "."
-        if: ${{ matrix.cxx == 'clang++' || (matrix.cxx == 'g++-11' && matrix.cmake_build_type == 'Debug') }}
+        if: ${{ matrix.cxx == 'clang++' || (matrix.cxx == 'g++' && matrix.cmake_build_type == 'Debug') }}
 
-      - name: Run BuildAndInstallCPlusPlusProgram.py in code coverage mode if g++-11 Release
+      - name: Run BuildAndInstallCPlusPlusProgram.py in code coverage mode if g++ Release
         run: |
            python FileArbDevOpsPython/BuildAndInstallCPlusPlusProgram.py \
               --solution-name=FileArb \
@@ -80,12 +80,12 @@ jobs:
         env:
           CXX: "/usr/bin/${{ matrix.cxx }}"
           PYTHONPATH: "."
-        if: ${{ matrix.cxx == 'g++-11' && matrix.cmake_build_type == 'Release' }}
+        if: ${{ matrix.cxx == 'g++' && matrix.cmake_build_type == 'Release' }}
 
       - name: Print .comment section of binary libFileArbTests to confirm it was linked with LLD
         run: readelf --string-dump .comment "${{matrix.cmake_build_type}}/libFileArbTests/libFileArbTests"
 
-      - name: Install and run lcov 2.3-beta then upload to Codecov.io if g++-11 Release
+      - name: Install and run lcov 2.3-beta then upload to Codecov.io if g++ Release
         run: |
           mkdir -p lcov_2_3
           wget https://github.com/linux-test-project/lcov/releases/download/v2.3-beta/lcov-2.3.tar.gz --output-document="lcov_2_3/lcov-2.3.tar.gz"
@@ -94,7 +94,7 @@ jobs:
           lcov_2_3/bin/lcov --directory . --capture --no-external --ignore-errors inconsistent --output-file coverage.info
           lcov_2_3/bin/lcov --list coverage.info
           bash <(curl -s https://codecov.io/bash) -f coverage.info -t ${{ secrets.CODECOV_TOKEN }} || echo "Codecov did not collect coverage reports"
-        if: ${{ matrix.cxx == 'g++-11' && matrix.cmake_build_type == 'Release' }}
+        if: ${{ matrix.cxx == 'g++' && matrix.cmake_build_type == 'Release' }}
 
       - name: tree GITHUB_WORKSPACE
         run: tree $GITHUB_WORKSPACE