Bump sbf-tools to v1.30

This commit is contained in:
Dmitri Makarov 2022-10-17 09:55:24 -04:00 committed by Dmitri Makarov
parent b6f5cc6ebf
commit 786c558a1f
4 changed files with 5 additions and 5 deletions

View File

@ -102,7 +102,7 @@ if [[ ! -e criterion-$version.md || ! -e criterion ]]; then
fi fi
# Install Rust-BPF # Install Rust-BPF
version=v1.29 version=v1.30
if [[ ! -e bpf-tools-$version.md || ! -e bpf-tools ]]; then if [[ ! -e bpf-tools-$version.md || ! -e bpf-tools ]]; then
( (
set -e set -e

View File

@ -830,7 +830,7 @@ fn main() {
// The following line is scanned by CI configuration script to // The following line is scanned by CI configuration script to
// separate cargo caches according to the version of sbf-tools. // separate cargo caches according to the version of sbf-tools.
let sbf_tools_version = "v1.29"; let sbf_tools_version = "v1.30";
let version = format!("{}\nsbf-tools {}", crate_version!(), sbf_tools_version); let version = format!("{}\nsbf-tools {}", crate_version!(), sbf_tools_version);
let matches = clap::Command::new(crate_name!()) let matches = clap::Command::new(crate_name!())
.about(crate_description!()) .about(crate_description!())

View File

@ -14,7 +14,7 @@ fn run_cargo_build(crate_name: &str, extra_args: &[&str], fail: bool) {
.join(crate_name) .join(crate_name)
.join("Cargo.toml"); .join("Cargo.toml");
let toml = format!("{}", toml.display()); let toml = format!("{}", toml.display());
let mut args = vec!["-v", "--sbf-sdk", "../bpf", "--manifest-path", &toml]; let mut args = vec!["-v", "--sbf-sdk", "../sbf", "--manifest-path", &toml];
for arg in extra_args { for arg in extra_args {
args.push(arg); args.push(arg);
} }
@ -113,7 +113,7 @@ fn test_sbfv2() {
.expect("Unable to get ../.. of current working dir"); .expect("Unable to get ../.. of current working dir");
let readelf = root let readelf = root
.join("sdk") .join("sdk")
.join("bpf") .join("sbf")
.join("dependencies") .join("dependencies")
.join("sbf-tools") .join("sbf-tools")
.join("llvm") .join("llvm")

View File

@ -102,7 +102,7 @@ if [[ ! -e criterion-$version.md || ! -e criterion ]]; then
fi fi
# Install Rust-SBF # Install Rust-SBF
version=v1.29 version=v1.30
if [[ ! -e sbf-tools-$version.md || ! -e sbf-tools ]]; then if [[ ! -e sbf-tools-$version.md || ! -e sbf-tools ]]; then
( (
set -e set -e