From 62440246ec2d9fdc16d9a9ae535087c3498fc273 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 4 Mar 2024 12:00:51 +1300
Subject: [PATCH] ci: Add CC_SHORT env var

New Setup Cpp step uses fully qualified paths for $CC and $CXX so ${CC%%-*} no longer works.
Remove os_name since it's not needed anymore.
---
 .github/workflows/test-compile.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test-compile.yml b/.github/workflows/test-compile.yml
index b03af9243..9c25874bb 100644
--- a/.github/workflows/test-compile.yml
+++ b/.github/workflows/test-compile.yml
@@ -30,6 +30,7 @@ jobs:
     env:
       CXXSTD: ${{ matrix.cpp_std }}
       CXXFLAGS: ${{ startsWith(matrix.compiler, 'gcc') && '-Wp,-D_GLIBCXX_ASSERTIONS' || ''}}
+      CC_SHORT: ${{ startsWith(matrix.compiler, 'gcc') && 'gcc' || 'clang' }}
     strategy:
       matrix:
         os:
@@ -43,9 +44,6 @@ jobs:
           - 'c++17'
           - 'c++20'
         include:
-          # Add os_name
-          - os: ubuntu-20.04
-            os_name: focal
           # macOS builds
           - os: macos-13
             compiler: 'clang'
@@ -55,11 +53,9 @@ jobs:
             cpp_std: 'c++17'
           # Limited testing for older compilers
           - os: ubuntu-20.04
-            os_name: focal
             compiler: 'clang-11'
             cpp_std: 'c++11'
           - os: ubuntu-20.04
-            os_name: focal
             compiler: 'gcc-10'
             cpp_std: 'c++11'
       fail-fast: false
@@ -109,8 +105,8 @@ jobs:
       - name: Build
         shell: bash
         run: |
-          make config-${CC%%-*}
-          make -j$procs CXXSTD=$CXXSTD CC=$CC CXX=$CXX LD=$CC
+          make config-$CC_SHORT
+          make -j$procs CXXSTD=$CXXSTD
 
       - name: Log yosys-config output
         run: |