Skip to content

Commit 4b86733

Browse files
authored
Update ci.yml
1 parent bda2525 commit 4b86733

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,11 @@ jobs:
281281
fi
282282
env:
283283
compiler: ${{ matrix.compiler }}
284+
285+
- uses: maxim-lobanov/setup-xcode@v1
286+
if: ${{ runner.os == 'macOS' && steps.cache.outputs.cache-hit != 'true' && ${{ matrix.cling }} == 'On' }}
287+
with:
288+
xcode-version: '15.4.0'
284289

285290
- name: Setup compiler on macOS
286291
if: ${{ runner.os == 'macOS' && steps.cache.outputs.cache-hit != 'true' }}
@@ -291,7 +296,6 @@ jobs:
291296
echo "CC=gcc-${vers}" >> $GITHUB_ENV
292297
echo "CXX=g++-${vers}" >> $GITHUB_ENV
293298
else
294-
echo "SDKROOT=$(xcrun --sdk macosx --show-sdk-path)" >> $GITHUB_ENV
295299
export ARCHITECHURE=$(uname -m)
296300
if [[ "$ARCHITECHURE" == "arm64" ]]; then
297301
cling_on=$(echo "${{ matrix.cling }}" | tr '[:lower:]' '[:upper:]')
@@ -304,7 +308,7 @@ jobs:
304308
echo 'CPATH="/opt/homebrew/include/"' >> $GITHUB_ENV
305309
echo 'LIBRARY_PATH="/opt/homebrew/lib/"' >> $GITHUB_ENV
306310
ls /Applications/
307-
echo 'DEVELOPER_DIR=/Applications/Xcode_15.4.app/Contents/Developer/' >> $GITHUB_ENV
311+
echo 'DEVELOPER_DIR=/Applications/Xcode15.4.app/Contents/Developer/' >> $GITHUB_ENV
308312
echo "CC=$(brew --prefix llvm@15)/bin/clang" >> $GITHUB_ENV
309313
echo "CXX=$(brew --prefix llvm@15)/bin/clang++" >> $GITHUB_ENV
310314
else
@@ -316,6 +320,7 @@ jobs:
316320
echo "CXX=$(brew --prefix llvm@15)/bin/clang++" >> $GITHUB_ENV
317321
fi
318322
fi
323+
echo "SDKROOT=$(xcrun --sdk macosx --show-sdk-path)" >> $GITHUB_ENV
319324
env:
320325
compiler: ${{ matrix.compiler }}
321326

@@ -770,6 +775,11 @@ jobs:
770775
env:
771776
compiler: ${{ matrix.compiler }}
772777

778+
- uses: maxim-lobanov/setup-xcode@v1
779+
if: ${{ runner.os == 'macOS' && ${{ matrix.cling }} == 'On' }}
780+
with:
781+
xcode-version: '15.4.0'
782+
773783
- name: Setup compiler on macOS
774784
if: runner.os == 'macOS'
775785
run: |

0 commit comments

Comments
 (0)