Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: pin Rust nightly version to 2023-01-10 #61

Merged
merged 1 commit into from
Jan 20, 2023
Merged

fix: pin Rust nightly version to 2023-01-10 #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dataplane/Dockerfile
View file
Open in desktop
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
View file
Open in desktop
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"
shaneutt marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion dataplane/xtask/src/build_ebpf.rs
View file
Open in desktop
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