Skip to content

Commit

Permalink
fix: pin Rust nightly version to 2023-01-10 (#61)
Browse files Browse the repository at this point in the history
The 2023-01-11 nightly rust build [broke
aya](aya-rs/aya#490) and subsequently the
build of the Blixt Dataplane.
Pinning the rust toolchain version to 2023-01-10 as a temporary fix.
  • Loading branch information
synthe102 authored and shaneutt committed Mar 3, 2023
1 parent c766aec commit dcca922
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions dataplane/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ RUN pacman -Syu --noconfirm
RUN pacman -S base-devel protobuf rustup --noconfirm

RUN rustup default stable
RUN rustup install nightly
RUN rustup component add rust-src --toolchain nightly
RUN rustup install nightly-2023-01-10
RUN rustup component add rust-src --toolchain nightly-2023-01-10
RUN rustup target add x86_64-unknown-linux-musl
RUN --mount=type=cache,target=/root/.cargo/registry \
cargo install bpf-linker
Expand Down
3 changes: 2 additions & 1 deletion dataplane/ebpf/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
[toolchain]
channel="nightly"
#TODO: revert once this issue with aya and rust nightly is fixed: https://github.com/aya-rs/aya/issues/490
channel="nightly-2023-01-10"
2 changes: 1 addition & 1 deletion dataplane/xtask/src/build_ebpf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ pub fn build_ebpf(opts: Options) -> Result<(), anyhow::Error> {
let dir = PathBuf::from("ebpf");
let target = format!("--target={}", opts.target);
let mut args = vec![
"+nightly",
"+nightly-2023-01-10",
"build",
"--verbose",
target.as_str(),
Expand Down

0 comments on commit dcca922

Please sign in to comment.