From ca3f58eafa22c89a977b9e1f66942bc8538a4ec6 Mon Sep 17 00:00:00 2001
From: Nick Gerace <nickagerace@gmail.com>
Date: Tue, 10 Dec 2024 11:46:54 -0500
Subject: [PATCH] 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 <nickagerace@gmail.com>
---
 .cargo/config.toml       |  3 ---
 .github/workflows/ci.yml |  3 ++-
 docs/DEVELOPING.md       | 10 ----------
 docs/RELEASE.md          |  4 ++--
 flake.lock               | 12 ++++++------
 flake.nix                |  7 +++++++
 justfile                 |  8 ++++++--
 7 files changed, 23 insertions(+), 24 deletions(-)
 delete mode 100644 docs/DEVELOPING.md

diff --git a/.cargo/config.toml b/.cargo/config.toml
index 88c4f89..9825746 100644
--- 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
index 4348faf..0b89fe9 100644
--- 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
deleted file mode 100644
index fa369bd..0000000
--- a/docs/DEVELOPING.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Developing
-
-This document contains information related to development.
-
-## `cargo xtask`
-
-This repository uses the [`cargo-xtask`](https://github.com/matklad/cargo-xtask) pattern for local development
-and automation.
-
-To see what commands are available, execute `cargo xtask` from the root of the repository.
\ No newline at end of file
diff --git a/docs/RELEASE.md b/docs/RELEASE.md
index c55a186..f685c1d 100644
--- 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
index 4015052..3d0d4b9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1733656523,
-        "narHash": "sha256-w0FXPfpGhOihoJDiwMsyN1EzpsXi2F8VQ+NVZQSMtys=",
+        "lastModified": 1733686850,
+        "narHash": "sha256-NQEO/nZWWGTGlkBWtCs/1iF1yl2lmQ1oY/8YZrumn3I=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "93dc9803a1ee435e590b02cde9589038d5cc3a4e",
+        "rev": "dd51f52372a20a93c219e8216fe528a648ffcbf4",
         "type": "github"
       },
       "original": {
@@ -48,11 +48,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733711706,
-        "narHash": "sha256-uDfJ/TrLLqrtoNzfPODDOVyZ+JWsJfd5T1r7xuE6h6g=",
+        "lastModified": 1733798086,
+        "narHash": "sha256-XHIh0h84xDnjkqampyNI/r2FAkKmwbL719ZsygiJHKE=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "4eb3f096e14431bd0ab4cca039f9c9d77331cbfc",
+        "rev": "8a19e07800d64462913f3dbf5c9a20ea7b50e6cd",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index d5a4a70..0466d3b 100644
--- 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
index cdaba46..9b70007 100644
--- 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