Merge pull request #674 from ajwerner/use-nightly-to-build-ebpf

test/integration-test: use +nightly for ebpf
reviewable/pr676/r1
ajwerner 1 year ago committed by GitHub
commit b28d4c34ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -0,0 +1,2 @@
[toolchain]
channel = "nightly"

@ -163,8 +163,6 @@ fn main() {
let mut cmd = Command::new("cargo"); let mut cmd = Command::new("cargo");
cmd.args([ cmd.args([
"build", "build",
"-p",
"integration-ebpf",
"-Z", "-Z",
"build-std=core", "build-std=core",
"--release", "--release",
@ -173,6 +171,12 @@ fn main() {
&target, &target,
]); ]);
// Workaround to make sure that the rust-toolchain.toml is respected.
let Package { manifest_path, .. } = packages.get(INTEGRATION_EBPF_PACKAGE).unwrap();
let integration_ebpf_dir = manifest_path.parent().unwrap();
cmd.env_remove("RUSTUP_TOOLCHAIN")
.current_dir(integration_ebpf_dir);
// Workaround for https://github.com/rust-lang/cargo/issues/6412 where cargo flocks itself. // Workaround for https://github.com/rust-lang/cargo/issues/6412 where cargo flocks itself.
let ebpf_target_dir = out_dir.join("integration-ebpf"); let ebpf_target_dir = out_dir.join("integration-ebpf");
cmd.arg("--target-dir").arg(&ebpf_target_dir); cmd.arg("--target-dir").arg(&ebpf_target_dir);

Loading…
Cancel
Save