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.

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

add netstat to nix #8655

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion .github/workflows/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ jobs:
done
done

- name: Check Cargo.toml To Ensure That All 3rd Party Crates Have Specified Versions
- name: Check Cargo.toml To Ensure That All 3rd Party Crates.io Published Crates Have Specified Versions
run: |
set -ex
cargo install [email protected]
Expand All @@ -269,6 +269,11 @@ jobs:

for ((i=0; i<$dependencies_keys_len; i++)); do
crate_name=$(jq -r ".[$i]" <<< $dependencies_keys)

if [[ `jq -r ".\"$crate_name\".git" <<< $dependencies` != null ]]; then
continue
fi

version=$(jq -r ".\"$crate_name\".version" <<< $dependencies || jq -r ".\"$crate_name\"" <<< $dependencies)

if [[ $version =~ $regex ]]; then
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.0", optional = true }
ockam_ebpf = { git = "https://github.com/build-trust/ockam-ebpf.git", 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" }
Expand Down
2 changes: 2 additions & 0 deletions tools/nix/parts/tooling.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ _: {
parallel
which
socat
] ++ lib.optionals stdenv.isLinux [
nettools
];

BATS_LIB = "${config.packages.bats}/share/bats";
Expand Down
Loading