From 0af97af0431076f945e146d14ee69c0e9c588c27 Mon Sep 17 00:00:00 2001
From: Neil Henderson <neil@bluetarpmedia.com>
Date: Thu, 23 May 2024 14:12:04 +1000
Subject: [PATCH] Fix patch filename

---
 .github/workflows/regression-tests.yml | 10 +++++++---
 regression-tests/run-tests.sh          |  6 ------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/regression-tests.yml b/.github/workflows/regression-tests.yml
index 4387cacdf9..56f708d241 100644
--- a/.github/workflows/regression-tests.yml
+++ b/.github/workflows/regression-tests.yml
@@ -20,10 +20,14 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-24.04]
-        compiler: [g++-13, g++-14, clang++-18]
+        compiler: [g++-13, g++-14]
         cxx_std: [c++2b]
         stdlib: [libstdc++]
         include:
+          - os: ubuntu-24.04
+            compiler: clang++-18
+            cxx_std: c++20
+            stdlib: libstdc++
           - os: ubuntu-22.04
             compiler: clang++-15
             cxx_std: c++20
@@ -89,6 +93,6 @@ jobs:
       if: ${{ !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.stdlib }}.patch
-        path: regression-tests/${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.stdlib }}.patch
+        name: ${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.cxx_std }}-${{ matrix.stdlib }}.patch
+        path: regression-tests/${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.cxx_std }}-${{ matrix.stdlib }}.patch
         if-no-files-found: ignore
diff --git a/regression-tests/run-tests.sh b/regression-tests/run-tests.sh
index aba8361fd6..43f6729d1d 100644
--- a/regression-tests/run-tests.sh
+++ b/regression-tests/run-tests.sh
@@ -155,16 +155,10 @@ else
         exec_out_dir="$expected_results_dir/clang-12"
     elif [[ "$compiler_version" == *"clang version 15.0"* ]]; then 
         exec_out_dir="$expected_results_dir/clang-15"
-        # c++2b causes strange issues on GitHub ubuntu runners
-        cxx_std="c++20"
     elif [[ "$compiler_version" == *"clang version 18.1"* ]]; then 
         exec_out_dir="$expected_results_dir/clang-18"
-        # c++2b causes strange issues on GitHub ubuntu runners
-        cxx_std="c++20"
     elif [[ "$compiler_version" == *"g++-10"* ]]; then
         exec_out_dir="$expected_results_dir/gcc-10"
-        # GCC 10 does not support c++2b
-        cxx_std=c++20
     elif [[ "$compiler_version" == *"g++-12"* ||
             "$compiler_version" == *"g++-13"*
          ]]; then