From 79af2ead4d73c9cedf4baa3a97fe77783c311bc8 Mon Sep 17 00:00:00 2001 From: mcbarton <150042563+mcbarton@users.noreply.github.com> Date: Thu, 8 Feb 2024 18:09:12 +0000 Subject: [PATCH] Try gcc-12 compiler osx cling jobs --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 783bd091..fe757ebf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,7 +54,7 @@ jobs: cppyy: On - name: os13-x86-clang-cling os: macos-13 - compiler: clang + compiler: gcc-12 clang-runtime: '13' cling: On cling-version: '1.0' @@ -73,7 +73,7 @@ jobs: cppyy: On - name: os14-arm-clang-cling os: macos-14 - compiler: clang + compiler: gcc-12 clang-runtime: '13' cling: On cling-version: '1.0' @@ -151,12 +151,13 @@ jobs: if: runner.os == 'macOS' run: | vers="${compiler#*-}" + echo "SDKROOT=$(xcrun --sdk macosx --show-sdk-path)" >> $GITHUB_ENV if [[ "${{ matrix.compiler }}" == *"gcc"* ]]; then brew install "gcc@$vers" echo "CC=gcc-${vers}" >> $GITHUB_ENV echo "CXX=g++-${vers}" >> $GITHUB_ENV else - echo "SDKROOT=$(xcrun --sdk macosx --show-sdk-path)" >> $GITHUB_ENV + #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)