From e76a26f285359809494f1a346eae50f7ef66d3a9 Mon Sep 17 00:00:00 2001
From: Toby Davis <pencilcaseman@gmail.com>
Date: Sat, 21 Oct 2023 23:29:49 +0100
Subject: [PATCH] Try a different permutation

---
 .github/workflows/wheels.yaml | 49 ++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/wheels.yaml b/.github/workflows/wheels.yaml
index c199138e..ce0f4e81 100644
--- a/.github/workflows/wheels.yaml
+++ b/.github/workflows/wheels.yaml
@@ -182,87 +182,87 @@ jobs:
 
 
           # MacOS x86_64
-          - os: macos-13
+          - os: macos-latest
             pythonVersion: 37
             bitness: 64
             platformID: macosx_x86_64
             pythonType: "cp"
 
-          - os: macos-13
+          - os: macos-latest
             pythonVersion: 38
             bitness: 64
             platformID: macosx_x86_64
             pythonType: "cp"
 
-          - os: macos-13
+          - os: macos-latest
             pythonVersion: 39
             bitness: 64
             platformID: macosx_x86_64
             pythonType: "cp"
 
-          - os: macos-13
+          - os: macos-latest
             pythonVersion: 310
             bitness: 64
             platformID: macosx_x86_64
             pythonType: "cp"
 
-          - os: macos-13
+          - os: macos-latest
             pythonVersion: 311
             bitness: 64
             platformID: macosx_x86_64
             pythonType: "cp"
 
-          - os: macos-13
+          - os: macos-latest
             pythonVersion: 312
             bitness: 64
             platformID: macosx_x86_64
             pythonType: "cp"
 
           # Apple-Silicon MacOS
-          - os: macos-13
+          - os: macos-latest
             pythonVersion: 38
             bitness: 64
             platformID: macosx_arm64
             pythonType: "cp"
 
-          - os: macos-13
+          - os: macos-latest
             pythonVersion: 39
             bitness: 64
             platformID: macosx_arm64
             pythonType: "cp"
 
-          - os: macos-13
+          - os: macos-latest
             pythonVersion: 310
             bitness: 64
             platformID: macosx_arm64
             pythonType: "cp"
 
-          - os: macos-13
+          - os: macos-latest
             pythonVersion: 311
             bitness: 64
             platformID: macosx_arm64
             pythonType: "cp"
 
-          - os: macos-13
+          - os: macos-latest
             pythonVersion: 312
             bitness: 64
             platformID: macosx_arm64
             pythonType: "cp"
 
           # Apple-Silicon MacOS PyPy
-          # - os: macos-13
+          # - os: macos-latest
           #   pythonVersion: 38
           #   bitness: 64
           #   platformID: macosx_arm64
           #   pythonType: "pp"
 
-          # - os: macos-13
+          # - os: macos-latest
           #   pythonVersion: 39
           #   bitness: 64
           #   platformID: macosx_arm64
           #   pythonType: "pp"
 
-          # - os: macos-13
+          # - os: macos-latest
           #   pythonVersion: 310
           #   bitness: 64
           #   platformID: macosx_arm64
@@ -283,26 +283,25 @@ jobs:
         run: pip install -r requirements.txt
 
       - name: Install XCode
-        if: matrix.os == 'macos-13'
+        if: matrix.os == 'macos-latest'
         uses: maxim-lobanov/setup-xcode@v1.5.1
         with:
           xcode-version: latest
 
       # This doesn't work for some reason
       # - name: Install Clang
-      #   if: matrix.os == 'macos-13'
+      #   if: matrix.os == 'macos-latest'
       #   uses: KyleMayes/install-llvm-action@v1
       #   with:
       #     version: "15.0"
       #     directory: "./llvm"
       #     env: on
 
-      # This also doesn't work :(
-      # - name: Install Clang
-      #   if: matrix.os == 'macos-13'
-      #   run: |
-      #     rm -f '/usr/local/bin/2to3*'
-      #     brew install llvm libomp
+      - name: Install Clang
+        if: matrix.os == 'macos-latest'
+        run: |
+          rm -f '/usr/local/bin/2to3*'
+          brew install llvm libomp
 
       - name: Build Wheels
         if: runner.os == 'macOS'
@@ -319,8 +318,10 @@ jobs:
           GITHUB_ACTIONS: ON
           LIBRAPID_GET_BLAS: OFF
           LIBRAPID_GET_FFTW: OFF
-          CC: $(brew --prefix llvm)/bin/clang
-          CXX: $(brew --prefix llvm)/bin/clang++
+          CC: /usr/local/opt/llvm/bin/clang
+          CXX: /usr/local/opt/llvm/bin/clang++
+          # CC: $(brew --prefix llvm)/bin/clang
+          # CXX: $(brew --prefix llvm)/bin/clang++
 
         run: |
           python -m pip install cibuildwheel