From 956dd0137537ba4ef02dfeec33debec2da5a9b40 Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Wed, 24 Jul 2024 13:37:39 -0700 Subject: [PATCH] Install Rust toolchain later `brew` seems to be breaking the rustup installed by rust-toolchain: ``` ==> Migrating formula rustup-init to rustup ==> Unlinking rustup-init ==> Moving rustup-init versions to /opt/homebrew/Cellar/rustup ==> Relinking rustup ``` Let's see if this fixes it. --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 60af9e26..e9f2e554 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -191,14 +191,6 @@ jobs: with: submodules: recursive - - uses: dtolnay/rust-toolchain@master - with: - toolchain: nightly - components: rust-src - targets: aarch64-unknown-linux-musl,x86_64-unknown-linux-musl - - - uses: Swatinem/rust-cache@v2 - - name: Install prerequisites if: runner.os == 'Linux' # ubuntu-22.04 comes with clang 14[0] which doesn't include support for signed and 64bit @@ -243,6 +235,14 @@ jobs: echo $(brew --prefix)/opt/gnu-tar/libexec/gnubin >> $GITHUB_PATH echo $(brew --prefix)/opt/llvm/bin >> $GITHUB_PATH + - uses: dtolnay/rust-toolchain@master + with: + toolchain: nightly + components: rust-src + targets: aarch64-unknown-linux-musl,x86_64-unknown-linux-musl + + - uses: Swatinem/rust-cache@v2 + - name: bpf-linker if: runner.os == 'macOS' # NB: rustc doesn't ship libLLVM.so on macOS, so disable proxying (default feature). We also