Fix post merge CI by using just instead of xtask

This commit fixes post merge CI by using just instead of xtask. In addition, references to xtask have either been replaced or removed throughout the repository. The nix flake has been updated to contain all binaries needed by the just targets as well. Signed-off-by: Nick Gerace <[email protected]>
nickgerace · Dec 10, 2024 · ca3f58e · ca3f58e
1 parent 8a75784
commit ca3f58e
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 24 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,5 +1,2 @@
 [build]
 rustdocflags = "--document-private-items"
-
-[alias]
-xtask = "run -q --manifest-path ./bin/xtask/Cargo.toml --"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,4 +15,5 @@ jobs:
         with:
           toolchain: stable
           components: rustfmt, clippy
-      - run: cargo xtask ci
+      - uses: taiki-e/install-action@just
+      - run: just ci
diff --git a/docs/DEVELOPING.md b/docs/DEVELOPING.md
diff --git a/docs/RELEASE.md b/docs/RELEASE.md
@@ -26,7 +26,7 @@ Steps should be executed in sequential order.
 - [ ] Verify that everything looks/works as expected:
 
 ```shell
-cargo xtask ci
+just ci
 ```
 
 - [ ] Create and _do not merge_ a commit with the following message: `Update libgfold to <tag>`
@@ -56,7 +56,7 @@ Steps should be executed in sequential order.
 - [ ] Verify that everything looks/works as expected:
 
 ```shell
-cargo xtask ci
+just ci
 ```
 
 - [ ] Create and _do not merge_ a commit with the following message: `Update gfold to <tag>`

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -35,6 +35,13 @@
         devShells.default = mkShell {
           packages = [
             alejandra
+            bash
+            cargo-audit
+            cargo-bloat
+            cargo-udeps
+            coreutils
+            hyperfine
+            just
             rust-bin-with-overrides
           ];
         };

diff --git a/justfile b/justfile
@@ -41,8 +41,12 @@ bench directory=('../'): build-release
 
 size: build-release
     #!/usr/bin/env bash
-    gdu -b target/release/gfold
+    checker=gdu
+    if ! command -v $checker; then
+        checker=du
+    fi
+    $checker -b target/release/gfold
     binary=$(which gfold)
     if [[ -n "$binary" ]]; then
-        gdu -b "$(realpath "$binary")"
+        $checker -b "$(realpath "$binary")"
     fi