Merge pull request #1073 from hash-org/llvm-18

hash-org · Jun 30, 2024 · c4bd0fb · c4bd0fb
2 parents 2c432a6 + b111bdf
commit c4bd0fb
Show file tree

Hide file tree

Showing 6 changed files with 98 additions and 82 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -11,8 +11,14 @@ env:
 
 jobs:
   build_and_test:
-    name: Test, clippy, and format
-    runs-on: ubuntu-latest
+    runs-on: ["${{ matrix.distro }}"]
+    name: Build on ${{ matrix.distro }} ${{ matrix.arch }}
+
+    strategy:
+      matrix:
+        include:
+          - arch: x64
+            distro: ubuntu-latest
     steps:
       - name: Checkout source code
         uses: actions/checkout@v2
@@ -22,12 +28,12 @@ jobs:
         uses: actions/cache@v2
         with: 
           path: ./llvm
-          key: llvm-15
+          key: llvm-18
 
       - name: Install LLVM
-        uses: KyleMayes/install-llvm-action@v1
+        uses: KyleMayes/install-llvm-action@abb6cec0ec431e834bc5e5090ea39a2d1d63a4c6 # v2.0.3
         with:
-          version: "15.0.6"
+          version: "18.1.4"
           cached: ${{ steps.cache-llvm.outputs.cache-hit }}
 
       - name: Install Rust nightly
@@ -39,12 +45,20 @@ jobs:
 
       - name: Dependency caching
         uses: Swatinem/rust-cache@v2
+
+      - name: LLVM location
+        # @@Dumbness: we need to install `libtinfo5` because of:
+        # - https://github.com/hash-org/hashc/actions/runs/9634436024/job/26570084536
+        run: |
+          sudo apt install -y libtinfo5
+          echo $LLVM_PATH
+          $LLVM_PATH/bin/llvm-config --version
       
       - name: Run tests
-        run: "LLVM_SYS_150_PREFIX=$LLVM_PATH cargo test --all --verbose"
+        run: "LLVM_SYS_181_PREFIX=$LLVM_PATH cargo test --all --verbose"
 
       - name: Run clippy
-        run: "LLVM_SYS_150_PREFIX=$LLVM_PATH cargo clippy --all -- -D warnings"
+        run: "LLVM_SYS_181_PREFIX=$LLVM_PATH cargo clippy --all -- -D warnings"
 
       - name: Check formatting
         run: "cargo fmt --all -- --check"
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/compiler/hash-codegen-llvm/Cargo.toml b/compiler/hash-codegen-llvm/Cargo.toml
@@ -8,8 +8,8 @@ edition = "2021"
 doctest = false
 
 [dependencies]
-llvm-sys = "150.0.3"
-inkwell = { git = "https://github.com/hash-org/inkwell.git", branch="master", features = ["llvm15-0"] }
+llvm-sys = "181.1.0"
+inkwell = { git = "https://github.com/hash-org/inkwell.git", branch="master", features = ["llvm18-1"] }
 
 hash-attrs = { path = "../hash-attrs" }
 hash-codegen = {path = "../hash-codegen" }