Skip to content

Commit

Permalink
chore(ci): remove macos workaround now that LLVM18 is in brew
Browse files Browse the repository at this point in the history
  • Loading branch information
alessandrod committed Apr 25, 2024
1 parent f089a37 commit fc2eb70
Showing 1 changed file with 2 additions and 16 deletions.
18 changes: 2 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -187,25 +187,12 @@ jobs:
with:
submodules: recursive

- if: runner.os == 'Linux'
uses: dtolnay/rust-toolchain@master
- 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 @@ -258,8 +245,7 @@ jobs:
if: runner.os == 'macOS'
# NB: rustc doesn't ship libLLVM.so on macOS, so disable proxying (default feature). We also
# --force so that bpf-linker gets always relinked against the latest LLVM installed by brew.
# Remove --rev when LLVM18 is released.
run: cargo install --force bpf-linker --git https://github.com/aya-rs/bpf-linker.git --rev 821f92990074cb7e950e25129dcd55e20424cede --no-default-features
run: cargo install --force bpf-linker --git https://github.com/aya-rs/bpf-linker.git --no-default-features

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

0 comments on commit fc2eb70

Please sign in to comment.