Selaa lähdekoodia

ci: ok, had to brew update, can we now request @20 directly?

Laytan 3 kuukautta sitten
vanhempi
commit
4eef57c6f1
2 muutettua tiedostoa jossa 4 lisäystä ja 8 poistoa
  1. 2 4
      .github/workflows/ci.yml
  2. 2 4
      .github/workflows/nightly.yml

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

@@ -94,15 +94,13 @@ jobs:
         if: matrix.os == 'macos-13'
         if: matrix.os == 'macos-13'
         run: |
         run: |
           brew update
           brew update
-          brew install llvm [email protected] lld
-          brew --prefix llvm@20 # Verifies it is LLVM 20
+          brew install llvm@20 [email protected] lld
 
 
       - name: Download LLVM (MacOS ARM)
       - name: Download LLVM (MacOS ARM)
         if: matrix.os == 'macos-14'
         if: matrix.os == 'macos-14'
         run: |
         run: |
           brew update
           brew update
-          brew install llvm wasmtime [email protected] lld
-          brew --prefix llvm@20 # Verifies it is LLVM 20
+          brew install llvm@20 wasmtime [email protected] lld
 
 
       - name: Build Odin
       - name: Build Odin
         run: ./build_odin.sh release
         run: ./build_odin.sh release

+ 2 - 4
.github/workflows/nightly.yml

@@ -94,8 +94,7 @@ jobs:
       - name: Download LLVM and setup PATH
       - name: Download LLVM and setup PATH
         run: |
         run: |
           brew update
           brew update
-          brew install llvm dylibbundler lld
-          brew --prefix llvm@20 # Verifies it is LLVM 20
+          brew install llvm@20 dylibbundler lld
 
 
       - name: build odin
       - name: build odin
         # These -L makes the linker prioritize system libraries over LLVM libraries, this is mainly to
         # These -L makes the linker prioritize system libraries over LLVM libraries, this is mainly to
@@ -133,8 +132,7 @@ jobs:
       - name: Download LLVM and setup PATH
       - name: Download LLVM and setup PATH
         run: |
         run: |
           brew update
           brew update
-          brew install llvm dylibbundler lld
-          brew --prefix llvm@20 # Verifies it is LLVM 20
+          brew install llvm@20 dylibbundler lld
 
 
       - name: build odin
       - name: build odin
         # These -L makes the linker prioritize system libraries over LLVM libraries, this is mainly to
         # These -L makes the linker prioritize system libraries over LLVM libraries, this is mainly to