From 38e3330750cc57f59bb7e4feff43d70a99c61982 Mon Sep 17 00:00:00 2001 From: Dave Tucker Date: Thu, 22 Feb 2024 12:26:23 +0000 Subject: [PATCH] ci: Use nightly-2022-02-12 on macOS LLVM-18 hasn't been released on macOS yet Signed-off-by: Dave Tucker --- .github/workflows/ci.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a30013449..8b295a6d8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -189,10 +189,14 @@ jobs: - uses: dtolnay/rust-toolchain@master with: - toolchain: nightly + toolchain: ${{ if runner.os == 'Linux' && 'nightly' || 'nightly-2024-02-12' }} 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 != 'Linux' + run: sed -i 's/nightly/nightly-2024-02-12/' test/integration-ebpf/rust-toolchain.toml + - uses: Swatinem/rust-cache@v2 - name: Install prerequisites @@ -244,7 +248,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 + # Revert back to using --git when LLVM18 is released. + run: cargo install bpf-linker --no-default-features - name: Download debian kernels if: runner.arch == 'ARM64'