From cab323976023fe682cc6101b205fc6dba5e98b2a Mon Sep 17 00:00:00 2001 From: Laytan Date: Wed, 2 Apr 2025 21:17:45 +0200 Subject: [PATCH] ci: fix macos llvm 20 --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/nightly.yml | 10 ++++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 15bfe81cf..9ffdf0c8c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -93,14 +93,14 @@ jobs: - name: Download LLVM (MacOS Intel) if: matrix.os == 'macos-13' run: | - brew install llvm@20 lua@5.4 lld - echo "/usr/local/opt/llvm@20/bin" >> $GITHUB_PATH + brew install llvm lua@5.4 lld + brew --prefix llvm@20 # Verifies it is LLVM 20 - name: Download LLVM (MacOS ARM) if: matrix.os == 'macos-14' run: | - brew install llvm@20 wasmtime lua@5.4 lld - echo "/opt/homebrew/opt/llvm@20/bin" >> $GITHUB_PATH + brew install llvm wasmtime lua@5.4 lld + brew --prefix llvm@20 # Verifies it is LLVM 20 - name: Build Odin run: ./build_odin.sh release diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index dfacc2712..b137c0ee8 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -93,8 +93,9 @@ jobs: - uses: actions/checkout@v4 - name: Download LLVM and setup PATH run: | - brew install llvm@20 dylibbundler lld - echo "/usr/local/opt/llvm@20/bin" >> $GITHUB_PATH + brew install llvm dylibbundler lld + brew --prefix llvm@20 # Verifies it is LLVM 20 + - name: build odin # These -L makes the linker prioritize system libraries over LLVM libraries, this is mainly to # not link with libunwind bundled with LLVM but link with libunwind on the system. @@ -130,8 +131,9 @@ jobs: - uses: actions/checkout@v4 - name: Download LLVM and setup PATH run: | - brew install llvm@20 dylibbundler lld - echo "/opt/homebrew/opt/llvm@20/bin" >> $GITHUB_PATH + brew install llvm dylibbundler lld + brew --prefix llvm@20 # Verifies it is LLVM 20 + - name: build odin # These -L makes the linker prioritize system libraries over LLVM libraries, this is mainly to # not link with libunwind bundled with LLVM but link with libunwind on the system.