Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

llvm 18 #1073

Merged
merged 8 commits into from
Jun 30, 2024
Merged

llvm 18 #1073

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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"
101 changes: 57 additions & 44 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions compiler/hash-codegen-llvm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
Loading
Loading