Skip to content

Commit

Permalink
ci: pin rust to nightly-2024-09-09 until public-api fixed
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Billy99 committed Sep 18, 2024
1 parent 2cd3576 commit 715b6e7
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 9 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -56,6 +56,7 @@ jobs:
run: |
set -euxo pipefail
cargo hack miri test --all-targets --feature-powerset \
--rust-version
--exclude aya-ebpf \
--exclude aya-ebpf-bindings \
--exclude aya-log-ebpf \
Expand Down Expand Up @@ -149,7 +150,7 @@ jobs:

- uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly
toolchain: nightly-2024-09-09
components: rust-src

- uses: Swatinem/rust-cache@v2
Expand Down Expand Up @@ -243,7 +244,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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions aya-obj/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ license.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true
rust-version = 1.83.0-nightly

[dependencies]
bytes = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion ebpf/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "nightly"
channel = "nightly-2024-09-09"
2 changes: 1 addition & 1 deletion netlify.toml
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion test/integration-ebpf/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "nightly"
channel = "nightly-2024-09-09"
2 changes: 1 addition & 1 deletion xtask/src/docs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion xtask/src/public_api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)? {
Expand Down

0 comments on commit 715b6e7

Please sign in to comment.