From f408b4de05775c5735742114641d302f87bcb989 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 6 Feb 2024 18:56:11 +1300
Subject: [PATCH] ci: fix compiler setup

`os_name` in include section needs to be explicit (putting it at the end doesn't
apply to the extra jobs).

Move macOS test to extra job instead of doing all gcc/clang (which isn't setup
for mac anyway).

Also adds name to build-yosys task.
---
 .github/workflows/test-build.yml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index ec132e7c1..204174795 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -24,9 +24,10 @@ jobs:
           concurrent_skipping: 'same_content_newer'
 
   build-yosys:
+    name: Build Yosys
+    runs-on: ${{ matrix.os }}
     needs: pre_job
     if: needs.pre_job.outputs.should_skip != 'true'
-    runs-on: ${{ matrix.os }}
     env:
       CC: ${{ matrix.compiler }}
       CXX: ${{ matrix.compiler }}
@@ -35,7 +36,6 @@ jobs:
       matrix:
         os:
           - ubuntu-20.04
-          - macos-13
         compiler:
           - 'clang-12'
           - 'gcc-11'
@@ -45,20 +45,27 @@ jobs:
           - 'c++17'
           - 'c++20'
         include:
+          # Add os_name
+          - os: ubuntu-20.04
+            os_name: focal
           # Build for testing
           - os: ubuntu-20.04
+            os_name: focal
+            compiler: 'clang'
+            cpp_std: 'c++11'
+          # macOS build
+          - os: macos-13
             compiler: 'clang'
             cpp_std: 'c++11'
           # 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'
-          # Add os_name
-          - os: ubuntu-20.04
-            os_name: focal
       fail-fast: false
     steps:
       - name: Install Linux Dependencies