From 0e74b1126a9943b8cf20afbdd27e8d1b95db9403 Mon Sep 17 00:00:00 2001
From: mcbarton <150042563+mcbarton@users.noreply.github.com>
Date: Wed, 8 May 2024 15:41:10 +0100
Subject: [PATCH] Add llvm 18 for osx to ci

---
 .github/workflows/ci.yml | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e3880173e..258bae78f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,11 +48,11 @@ jobs:
             os: macos-14
             compiler: clang
             clang-runtime: '17'
-          #Turn on once clang-18 available through Homebrew
-          #- name: osx14-arm-clang-runtime18
-          #  os: macos-14
-          #  compiler: clang
-          #  clang-runtime: '18'
+            
+          - name: osx14-arm-clang-runtime18
+            os: macos-14
+            compiler: clang
+            clang-runtime: '18'
 
           - name: osx13-x86-clang-runtime12
             os: macos-13
@@ -83,11 +83,11 @@ jobs:
             os: macos-13
             compiler: clang
             clang-runtime: '17'
-          #Turn on once clang-18 available through Homebrew
-          #- name: osx13-x86-clang-runtime18
-          #  os: macos-13
-          #  compiler: clang
-          #  clang-runtime: '18'
+            
+          - name: osx13-x86-clang-runtime18
+            os: macos-13
+            compiler: clang
+            clang-runtime: '18'
 
           - name: win2022-msvc-runtime14
             os: windows-2022
@@ -607,6 +607,7 @@ jobs:
         {
           echo "Unsupported compiler - fix YAML file"
         }
+
     - name: Setup LLVM/Clang on macOS
       if: runner.os == 'macOS'
       run: |
@@ -619,14 +620,12 @@ jobs:
 
         # For now Package llvm@18 is unsuported on brew, llvm <=@11 are deprecated or deleted.
         # Install llvm from github releases.
-        if [[ '${{ matrix.clang-runtime }}' == '18' || ${{ matrix.clang-runtime }} -le 11 ]]; then
+        if [[ ${{ matrix.clang-runtime }} -le 11 ]]; then
           PATH_TO_LLVM_BUILD=/usr/local/opt/llvm@${{ matrix.clang-runtime }}/
           pushd /usr/local/opt
-          w="0"
-          [ '${{ matrix.clang-runtime }}' == '17' ] && w="6"
-          sudo curl -L https://github.com/llvm/llvm-project/releases/download/llvmorg-${{ matrix.clang-runtime }}.0.$w/clang+llvm-${{ matrix.clang-runtime }}.0.$w-x86_64-apple-darwin.tar.xz | sudo xz -d -c | sudo tar -x
+          q="0"
           sudo rm -fr /usr/local/clang*
-          sudo mv clang+llvm-${{ matrix.clang-runtime }}.0.$w-x86_64-apple-darwin/ llvm@${{ matrix.clang-runtime }}/
+          sudo mv clang+llvm-${{ matrix.clang-runtime }}.$q.$w-x86_64-apple-darwin/ llvm@${{ matrix.clang-runtime }}/
           # Use llvm/llvm@10/llvm@6 Filecheck
           if [[ ! -f $PATH_TO_LLVM_BUILD/bin/FileCheck ]]; then
             if [[ -f /usr/local/opt/llvm/bin/FileCheck ]]; then
@@ -640,7 +639,7 @@ jobs:
           popd
         fi
 
-        if [[ '${{ matrix.clang-runtime }}' != '18' && ${{ matrix.clang-runtime }} -gt 11 ]]; then
+        if [[ ${{ matrix.clang-runtime }} -gt 11 ]]; then
           brew install llvm@${{ matrix.clang-runtime }}
         else
           # Remove the c++ headers that come with the llvm package from homebrew