Skip to content

Commit

Permalink
ci: Use nightly-2022-02-12 on macOS
Browse files Browse the repository at this point in the history
LLVM-18 hasn't been released on macOS yet

Signed-off-by: Dave Tucker <[email protected]>
  • Loading branch information
dave-tucker committed Feb 22, 2024
1 parent 0c58bb6 commit 6e9dcee
Showing 1 changed file with 16 additions and 2 deletions.
18 changes: 16 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,25 @@ jobs:
with:
submodules: recursive

- uses: dtolnay/rust-toolchain@master
- if: runner.os == 'Linux'
uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly
components: rust-src
targets: aarch64-unknown-linux-musl,x86_64-unknown-linux-musl

#### Temporary workaround for LLVM 18 not being released yet.
- if: runner.os == 'macOS'
uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2024-02-12
components: rust-src
targets: aarch64-unknown-linux-musl,x86_64-unknown-linux-musl

- if: runner.os == 'macOS'
run: sed -i '' 's/nightly/nightly-2024-02-12/' test/integration-ebpf/rust-toolchain.toml
#### End of temporary workaround.

- uses: Swatinem/rust-cache@v2

- name: Install prerequisites
Expand Down Expand Up @@ -244,7 +257,8 @@ jobs:
- name: bpf-linker
if: runner.os == 'macOS'
# NB: rustc doesn't ship libLLVM.so on macOS, so disable proxying (default feature).
run: cargo install bpf-linker --git https://github.com/aya-rs/bpf-linker.git --no-default-features
# Remove --rev when LLVM18 is released.
run: cargo install bpf-linker --git https://github.com/aya-rs/bpf-linker.git --rev 821f92990074cb7e950e25129dcd55e20424cede --no-default-features

- name: Download debian kernels
if: runner.arch == 'ARM64'
Expand Down

0 comments on commit 6e9dcee

Please sign in to comment.