From 6f2047f96cdd899d6c716988e1b73fe146b1f4b5 Mon Sep 17 00:00:00 2001 From: Billy McFall <22157057+Billy99@users.noreply.github.com> Date: Wed, 11 Sep 2024 11:37:48 -0400 Subject: [PATCH] ci: pin rust to nightly-2024-09-09 until public-api fixed The public-api (cargo xtask public-api) is failing with the latest rust nightly package. Temporarily pin nightly to last known working version until the issue can be resolved. Signed-off-by: Billy McFall <22157057+Billy99@users.noreply.github.com> --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/gen.yml | 2 +- ebpf/rust-toolchain.toml | 2 +- netlify.toml | 2 +- test/integration-ebpf/rust-toolchain.toml | 2 +- xtask/src/docs.rs | 2 +- xtask/src/public_api.rs | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e21cff5..b7a2677e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: - uses: dtolnay/rust-toolchain@master with: - toolchain: nightly + toolchain: nightly-2024-09-09 components: rustfmt, clippy, miri, rust-src - uses: Swatinem/rust-cache@v2 @@ -55,7 +55,7 @@ jobs: - name: Run miri run: | set -euxo pipefail - cargo hack miri test --all-targets --feature-powerset \ + cargo +nightly-2024-09-09 hack miri test --all-targets --feature-powerset \ --exclude aya-ebpf \ --exclude aya-ebpf-bindings \ --exclude aya-log-ebpf \ @@ -149,7 +149,7 @@ jobs: - uses: dtolnay/rust-toolchain@master with: - toolchain: nightly + toolchain: nightly-2024-09-09 components: rust-src - uses: Swatinem/rust-cache@v2 @@ -243,7 +243,7 @@ jobs: - uses: dtolnay/rust-toolchain@master with: - toolchain: nightly + toolchain: nightly-2024-09-09 components: rust-src targets: aarch64-unknown-linux-musl,x86_64-unknown-linux-musl diff --git a/.github/workflows/gen.yml b/.github/workflows/gen.yml index 3f15e0e1..665f8052 100644 --- a/.github/workflows/gen.yml +++ b/.github/workflows/gen.yml @@ -21,7 +21,7 @@ jobs: - uses: dtolnay/rust-toolchain@master with: - toolchain: nightly + toolchain: nightly-2024-09-09 components: rustfmt, clippy - uses: Swatinem/rust-cache@v2 diff --git a/ebpf/rust-toolchain.toml b/ebpf/rust-toolchain.toml index 5d56faf9..b2a53a7c 100644 --- a/ebpf/rust-toolchain.toml +++ b/ebpf/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "nightly" +channel = "nightly-2024-09-09" diff --git a/netlify.toml b/netlify.toml index 178413df..7738c238 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,3 +1,3 @@ [build] publish = "site" -command = "rustup toolchain install nightly -c rust-src && cargo xtask docs" +command = "rustup toolchain install nightly-2024-09-09 -c rust-src && cargo xtask docs" diff --git a/test/integration-ebpf/rust-toolchain.toml b/test/integration-ebpf/rust-toolchain.toml index 5d56faf9..b2a53a7c 100644 --- a/test/integration-ebpf/rust-toolchain.toml +++ b/test/integration-ebpf/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "nightly" +channel = "nightly-2024-09-09" diff --git a/xtask/src/docs.rs b/xtask/src/docs.rs index df4f7170..3ea6f11f 100644 --- a/xtask/src/docs.rs +++ b/xtask/src/docs.rs @@ -44,7 +44,7 @@ pub fn docs(metadata: Metadata) -> Result<()> { Command::new("cargo") .current_dir(&workspace_root) .env("RUSTDOCFLAGS", rustdocflags) - .args(["+nightly", "doc", "--no-deps", "--all-features"]) + .args(["+nightly-2024-09-09", "doc", "--no-deps", "--all-features"]) .args( PACKAGE_TO_DESCRIPTION .iter() diff --git a/xtask/src/public_api.rs b/xtask/src/public_api.rs index ac11ee18..7aedaa55 100644 --- a/xtask/src/public_api.rs +++ b/xtask/src/public_api.rs @@ -24,7 +24,7 @@ pub struct Options { } pub fn public_api(options: Options, metadata: Metadata) -> Result<()> { - let toolchain = "nightly"; + let toolchain = "nightly-2024-09-09"; let Options { bless, target } = options; if !rustup_toolchain::is_installed(toolchain)? {