From 7d19bde66bfe893cb69a550552740524064e60fa Mon Sep 17 00:00:00 2001 From: Michal Rostecki Date: Sat, 28 Jan 2023 13:22:56 +0800 Subject: [PATCH] Unpin Rust nightly The issues with core::sync::atomic got fixed. Signed-off-by: Michal Rostecki --- .github/workflows/build-aya-bpf.yml | 2 +- .github/workflows/build-aya.yml | 2 +- netlify.toml | 2 +- xtask/src/build_ebpf.rs | 2 +- xtask/src/docs/mod.rs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-aya-bpf.yml b/.github/workflows/build-aya-bpf.yml index 1d134ca9..a29d7c09 100644 --- a/.github/workflows/build-aya-bpf.yml +++ b/.github/workflows/build-aya-bpf.yml @@ -30,7 +30,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2023-01-10 + toolchain: nightly components: rust-src override: true diff --git a/.github/workflows/build-aya.yml b/.github/workflows/build-aya.yml index 0b9a0ef5..991298fa 100644 --- a/.github/workflows/build-aya.yml +++ b/.github/workflows/build-aya.yml @@ -57,7 +57,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2023-01-10 + toolchain: nightly components: rustfmt, clippy, rust-src target: x86_64-unknown-linux-musl override: true diff --git a/netlify.toml b/netlify.toml index 8e0773ea..3ad62912 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,3 +1,3 @@ [build] publish = "site" - command = "rustup toolchain install nightly-2023-01-10 -c rust-src && cargo xtask docs" + command = "rustup toolchain install nightly -c rust-src && cargo xtask docs" diff --git a/xtask/src/build_ebpf.rs b/xtask/src/build_ebpf.rs index cd5b9234..4f98feba 100644 --- a/xtask/src/build_ebpf.rs +++ b/xtask/src/build_ebpf.rs @@ -60,7 +60,7 @@ fn build_rust_ebpf(opts: &BuildEbpfOptions) -> anyhow::Result<()> { let target = format!("--target={}", opts.target); let mut args = vec![ - "+nightly-2023-01-10", + "+nightly", "build", "--verbose", target.as_str(), diff --git a/xtask/src/docs/mod.rs b/xtask/src/docs/mod.rs index b17ecb7c..bfeca3a9 100644 --- a/xtask/src/docs/mod.rs +++ b/xtask/src/docs/mod.rs @@ -61,7 +61,7 @@ fn build_docs(working_dir: &PathBuf, abs_header_path: &Path) -> Result<(), anyho .expect("failed to replace logo"); assert!(replace.success()); - let args = vec!["+nightly-2023-01-10", "doc", "--no-deps", "--all-features"]; + let args = vec!["+nightly", "doc", "--no-deps", "--all-features"]; let status = Command::new("cargo") .current_dir(working_dir)