Update ci.yml

compiler-research · Feb 8, 2024 · 350fa2c · 350fa2c
1 parent 6ca96b8
commit 350fa2c
Showing 1 changed file with 21 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -42,42 +42,42 @@ jobs:
             cppyy: On
           - name: osx13-x86-clang-clang17
             os: macos-13
-            compiler: clang-17
+            compiler: clang
             clang-runtime: '17'
             cling: Off
             cppyy: On
           - name: osx13-x86-clang-clang16
             os: macos-13
-            compiler: clang-17
+            compiler: clang
             clang-runtime: '16'
             cling: Off
             cppyy: On
-          - name: os13-x86-clang-cling
-            os: macos-13
-            compiler: clang-17
-            clang-runtime: '13'
-            cling: On
-            cling-version: '1.0'
-            cppyy: On
+          #- name: osx13-x86-clang-cling
+          #  os: macos-13
+          #  compiler: clang
+          #  clang-runtime: '13'
+          #  cling: On
+          #  cling-version: '1.0'
+          #  cppyy: On
           - name: osx14-arm-clang-clang17
             os: macos-14
-            compiler: clang-17
+            compiler: clang
             clang-runtime: '17'
             cling: Off
             cppyy: On
           - name: osx14-arm-clang-clang16
             os: macos-14
-            compiler: clang-17
+            compiler: clang
             clang-runtime: '16'
             cling: Off
             cppyy: On
-          - name: os14-arm-clang-cling
-            os: macos-14
-            compiler: clang-17
-            clang-runtime: '13'
-            cling: On
-            cling-version: '1.0'
-            cppyy: On
+          #- name: osx14-arm-clang-cling
+          #  os: macos-14
+          #  compiler: clang
+          #  clang-runtime: '13'
+          #  cling: On
+          #  cling-version: '1.0'
+          #  cppyy: On
 
     steps:
     - uses: actions/checkout@v3
@@ -157,12 +157,12 @@ jobs:
           echo "CC=gcc-${vers}" >> $GITHUB_ENV
           echo "CXX=g++-${vers}" >> $GITHUB_ENV
         else
-          brew install llvm@${vers}
+          
           #Use clang-15 and clang++-15 compiler that is installed on runner, instead of one
           #provided by MacOS (could brew install clang-16/17 to use consistent version
           #of clang)
-          echo "CC=$(brew --prefix llvm@17)/bin/clang" >> $GITHUB_ENV
-          echo "CXX=$(brew --prefix llvm@17)/bin/clang++" >> $GITHUB_ENV
+          echo "CC=$(brew --prefix llvm@15)/bin/clang" >> $GITHUB_ENV
+          echo "CXX=$(brew --prefix llvm@15)/bin/clang++" >> $GITHUB_ENV
         fi
       env:
         compiler: ${{ matrix.compiler }}