2
0
Laytan 4 сар өмнө
parent
commit
cab3239760

+ 4 - 4
.github/workflows/ci.yml

@@ -93,14 +93,14 @@ jobs:
       - name: Download LLVM (MacOS Intel)
         if: matrix.os == 'macos-13'
         run: |
-          brew install llvm@20 [email protected] lld
-          echo "/usr/local/opt/llvm@20/bin" >> $GITHUB_PATH
+          brew install llvm [email protected] 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 [email protected] lld
-          echo "/opt/homebrew/opt/llvm@20/bin" >> $GITHUB_PATH
+          brew install llvm wasmtime [email protected] lld
+          brew --prefix llvm@20 # Verifies it is LLVM 20
 
       - name: Build Odin
         run: ./build_odin.sh release

+ 6 - 4
.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.