Skip to content

Commit

Permalink
Adjust for sterile
Browse files Browse the repository at this point in the history
  • Loading branch information
daniel-noland committed Oct 27, 2024
1 parent c1aa293 commit ace6897
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
14 changes: 9 additions & 5 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ set dotenv-path := "."
set dotenv-filename := "./scripts/rust.env"

debug := "false"
export DPDK_SYS_COMMIT := shell("source ./scripts/dpdk-sys.env && echo $DPDK_SYS_COMMIT")
DPDK_SYS_COMMIT := shell("source ./scripts/dpdk-sys.env && echo $DPDK_SYS_COMMIT")
hugepages_1g := "8"
hugepages_2m := "1024"
_just_debuggable_ := if debug == "true" { "set -x" } else { "" }
target := "x86_64-unknown-linux-gnu"
profile := "debug"
sterile_target_dir := `printf -- %s "/run/user/$(id -u)/hedgehog/dataplane/sterile"`
container_repo := "ghcr.io/githedgehog/dataplane"
rust := "pinned"
rust := "stable"
_dpdk_sys_container_repo := "ghcr.io/githedgehog/dpdk-sys"
_env_branch := "main"
_dev_env_container := _dpdk_sys_container_repo + "/dev-env:" + _env_branch + "-rust-" + rust + "-" + DPDK_SYS_COMMIT
Expand All @@ -44,18 +44,18 @@ _network := "host"

# The git commit hash of the last commit to HEAD

_commit := `git rev-parse HEAD || echo "sterile"`
_commit := `git rev-parse HEAD 2>/dev/null || echo "sterile"`

# The git branch we are currnetly on

_branch := `git rev-parse --abbrev-ref HEAD || echo "sterile"`
_branch := `git rev-parse --abbrev-ref HEAD 2>/dev/null || echo "sterile"`

# The git tree state (clean or dirty)

_clean := ```
set -euo pipefail
(
git diff-index --quiet HEAD -- && \
git diff-index --quiet HEAD -- 2>/dev/null && \
test -z "$(git ls-files --exclude-standard --others)" && \
echo clean \
) || echo dirty
Expand Down Expand Up @@ -101,6 +101,10 @@ _build_time := ```
printf -- "%s" "${official}"
```

[private]
@default:
just --list --justfile {{justfile()}}

[group('ci')]
[private]
[script]
Expand Down
2 changes: 1 addition & 1 deletion scripts/dpdk-sys.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
DPDK_SYS_BRANCH="main"
DPDK_SYS_COMMIT="2526b21b8f24f582fe27ff012b42e75831a4761a"
DPDK_SYS_COMMIT="795fd3a8dcf30b5771974f6d526d15467ab51d77"

0 comments on commit ace6897

Please sign in to comment.