Tweak MacOS CI to find LLVM

vcfxb · May 17, 2024 · f2a6f12 · f2a6f12
1 parent f2a6e6d
commit f2a6f12
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/cargo-check.yml b/.github/workflows/cargo-check.yml
@@ -71,8 +71,7 @@ jobs:
 
       - name: Get the LLVM version (Mac Only)
         if: ${{ matrix.os == 'macos-latest' }}
-        # run: ${{ matrix.llvm-install-dir }}/bin/llvm-config --version
-        run: llvm-config --version
+        run: ${{ matrix.llvm-install-dir }}/bin/llvm-config --version
         # For some reason, this seems to error even when llvm-config is available somewhere. Leaving it in for now. 
         continue-on-error: true
 
@@ -85,8 +84,8 @@ jobs:
       - name: Run cargo check (Mac Only)
         if: ${{ matrix.os == 'macos-latest' }}
         run: cargo check
-        # env:
-        #   LLVM_SYS_180_PREFIX: ${{ matrix.llvm-install-dir }} 
+        env:
+          LLVM_SYS_180_PREFIX: ${{ matrix.llvm-install-dir }} 
 
       - name: Run cargo check (Ubuntu & Windows)
         if: ${{ matrix.os != 'macos-latest' }}

diff --git a/.github/workflows/cargo-test.yml b/.github/workflows/cargo-test.yml
@@ -73,8 +73,7 @@ jobs:
 
       - name: Get the LLVM version (Mac Only)
         if: ${{ matrix.os == 'macos-latest' }}
-        # run: ${{ matrix.llvm-install-dir }}/bin/llvm-config --version
-        run: llvm-config --version
+        run: ${{ matrix.llvm-install-dir }}/bin/llvm-config --version
         # For some reason, this seems to error even when llvm-config is available somewhere. Leaving it in for now. 
         continue-on-error: true
 
@@ -87,8 +86,8 @@ jobs:
       - name: Run cargo test (Mac Only)
         if: ${{ matrix.os == 'macos-latest' }}
         run: cargo test
-        # env:
-        #   LLVM_SYS_180_PREFIX: ${{ matrix.llvm-install-dir }} 
+        env:
+          LLVM_SYS_180_PREFIX: ${{ matrix.llvm-install-dir }} 
 
       - name: Run cargo test (Ubuntu & Windows)
         if: ${{ matrix.os != 'macos-latest' }}