From 8badcce8ca95f4145459ff2ad637a48c167fe1d5 Mon Sep 17 00:00:00 2001 From: Michael Uti Date: Tue, 26 Nov 2024 18:43:34 +0100 Subject: [PATCH] chore: use crates.io published version of ockam_ebpf --- .github/workflows/all.yml | 3 ++- Cargo.lock | 5 +++-- NOTICE.md | 2 +- implementations/rust/ockam/ockam_transport_tcp/Cargo.toml | 2 +- tools/nix/parts/tooling.nix | 2 ++ 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/all.yml b/.github/workflows/all.yml index a92c871de62..cfab1b0c479 100644 --- a/.github/workflows/all.yml +++ b/.github/workflows/all.yml @@ -269,8 +269,9 @@ jobs: for ((i=0; i<$dependencies_keys_len; i++)); do crate_name=$(jq -r ".[$i]" <<< $dependencies_keys) - version=$(jq -r ".\"$crate_name\".version" <<< $dependencies || jq -r ".\"$crate_name\"" <<< $dependencies) + version=$(jq -r ".\"$crate_name\".version" <<< $dependencies || jq -r ".\"$crate_name\"" <<< $dependencies) + # It is mandatory that to publish to the crates.io repository, all our dependencies must have a version specified (must have been published to crates.io) if [[ $version =~ $regex ]]; then echo "crate_name: $crate_name" echo "version: $version" diff --git a/Cargo.lock b/Cargo.lock index 185003693cd..a91f0c106ec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4948,8 +4948,9 @@ dependencies = [ [[package]] name = "ockam_ebpf" -version = "0.4.0" -source = "git+https://github.com/build-trust/ockam-ebpf.git#d9a3ab82122ad643da394880159b12cc343896c0" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683813baba0672a720f53eacd1ca234b40b5785ece333b1f0d6b570cb3887e7a" dependencies = [ "reqwest", "url", diff --git a/NOTICE.md b/NOTICE.md index 96fd6c9158a..811ebe17877 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -362,7 +362,7 @@ This file contains attributions for any 3rd-party open source code used in this | objc2-foundation | MIT | https://crates.io/crates/objc2-foundation | | objc_id | MIT | https://crates.io/crates/objc_id | | object | Apache-2.0, MIT | https://crates.io/crates/object | -| ockam_ebpf | Apache-2.0 | https://github.com/build-trust/ockam-ebpf.git | +| ockam_ebpf | Apache-2.0 | https://crates.io/crates/ockam_ebpf | | once_cell | MIT, Apache-2.0 | https://crates.io/crates/once_cell | | onig | MIT | https://crates.io/crates/onig | | onig_sys | MIT | https://crates.io/crates/onig_sys | diff --git a/implementations/rust/ockam/ockam_transport_tcp/Cargo.toml b/implementations/rust/ockam/ockam_transport_tcp/Cargo.toml index 5facc0303df..5516ec557a0 100644 --- a/implementations/rust/ockam/ockam_transport_tcp/Cargo.toml +++ b/implementations/rust/ockam/ockam_transport_tcp/Cargo.toml @@ -40,7 +40,7 @@ cfg-if = "1.0.0" log = "0.4.21" minicbor = { version = "0.25.1", default-features = false, features = ["derive"] } ockam_core = { path = "../ockam_core", version = "^0.120.0" } -ockam_ebpf = { git = "https://github.com/build-trust/ockam-ebpf.git", version = "0.4.0", optional = true } +ockam_ebpf = { version = "0.5.0", optional = true } ockam_macros = { path = "../ockam_macros", version = "^0.35.0" } ockam_node = { path = "../ockam_node", version = "^0.132.0" } ockam_transport_core = { path = "../ockam_transport_core", version = "^0.97.0" } diff --git a/tools/nix/parts/tooling.nix b/tools/nix/parts/tooling.nix index 3807522553f..e851c8515b4 100644 --- a/tools/nix/parts/tooling.nix +++ b/tools/nix/parts/tooling.nix @@ -29,6 +29,8 @@ _: { parallel which socat + ] ++ lib.optionals stdenv.isLinux [ + nettools ]; BATS_LIB = "${config.packages.bats}/share/bats";