chore: improve CI caching

.github/workflows/build.yml

@@ -34,7 +34,7 @@ jobs:
       - name: Add Rust Cache
         uses: Swatinem/rust-cache@v2
         with:
-          shared-key: rust-build
+          shared-key: rust-release
           prefix-key: ${{ env.RUST_CACHE_KEY }}
           save-if: ${{ github.ref == 'refs/heads/next' }}
       - name: make - build
@@ -51,7 +51,7 @@ jobs:
       - name: Add Rust Cache
         uses: Swatinem/rust-cache@v2
         with:
-          shared-key: rust-build-wasm
+          shared-key: rust-wasm
           prefix-key: ${{ env.RUST_CACHE_KEY }}
           save-if: ${{ github.ref == 'refs/heads/next' }}
       - name: make - build-wasm

.github/workflows/lint.yml

@@ -88,7 +88,7 @@ jobs:
       - name: Add Rust Cache
         uses: Swatinem/rust-cache@v2
         with:
-          shared-key: rust-build
+          shared-key: rust-debug
           prefix-key: ${{ env.RUST_CACHE_KEY }}
           save-if: ${{ github.ref == 'refs/heads/next' }}
       - name: make - clippy
@@ -107,7 +107,7 @@ jobs:
       - name: Add Rust Cache
         uses: Swatinem/rust-cache@v2
         with:
-          shared-key: rust-build-wasm
+          shared-key: rust-wasm
           prefix-key: ${{ env.RUST_CACHE_KEY }}
           save-if: ${{ github.ref == 'refs/heads/next' }}
       - name: make - clippy-wasm
@@ -122,12 +122,6 @@ jobs:
         run: |
           rustup update --no-self-update nightly
           rustup +nightly component add rustfmt
-      - name: Add Rust Cache
-        uses: Swatinem/rust-cache@v2
-        with:
-          shared-key: rust-build
-          prefix-key: ${{ env.RUST_CACHE_KEY }}
-          save-if: ${{ github.ref == 'refs/heads/next' }}
       - name: Install prettier
         run: yarn install
       - name: make - format-check
@@ -153,7 +147,7 @@ jobs:
       - name: Add Rust Cache
         uses: Swatinem/rust-cache@v2
         with:
-          shared-key: rust-build-wasm
+          shared-key: rust-wasm
           prefix-key: ${{ env.RUST_CACHE_KEY }}
           save-if: ${{ github.ref == 'refs/heads/next' }}
       - name: Install dependencies
@@ -181,7 +175,7 @@ jobs:
       - name: Add Rust Cache
         uses: Swatinem/rust-cache@v2
         with:
-          shared-key: rust-build
+          shared-key: rust-nightly-release
           prefix-key: ${{ env.RUST_CACHE_KEY }}
           save-if: ${{ github.ref == 'refs/heads/next' }}
       - name: make - doc

.github/workflows/test.yml

@@ -34,7 +34,7 @@ jobs:
       - name: Add Rust Cache
         uses: Swatinem/rust-cache@v2
         with:
-          shared-key: rust-build
+          shared-key: rust-release
           prefix-key: ${{ env.RUST_CACHE_KEY }}
           save-if: ${{ github.ref == 'refs/heads/next' }}
       - uses: taiki-e/install-action@v2
@@ -50,7 +50,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: Swatinem/rust-cache@v2
         with:
-          shared-key: rust-build
+          shared-key: rust-debug
           prefix-key: ${{ env.RUST_CACHE_KEY }}
           save-if: ${{ github.ref == 'refs/heads/next' }}
       - name: Install rust
@@ -133,9 +133,19 @@ jobs:
       - name: Add Rust Cache
         uses: Swatinem/rust-cache@v2
         with:
-          shared-key: rust-build
+          shared-key: rust-release
           prefix-key: ${{ env.RUST_CACHE_KEY }}
           save-if: ${{ github.ref == 'refs/heads/next' }}
+      - name: Restore node-builder binary
+        uses: actions/cache@v4
+        with:
+          path: target/release/testing-node-builder
+          key: ${{ runner.os }}-node-builder-${{ hashFiles('Cargo.lock') }}
+      - name: Restore note-transport binary
+        uses: actions/cache@v4
+        with:
+          path: target/note-transport/release/miden-note-transport-node-bin
+          key: ${{ runner.os }}-note-transport-${{ hashFiles('Cargo.lock') }}
       - name: Start test node
         run: make start-node-background
       - name: Start note transport
@@ -164,7 +174,7 @@ jobs:
       - name: Add Rust Cache
         uses: Swatinem/rust-cache@v2
         with:
-          shared-key: rust-build-wasm
+          shared-key: rust-wasm
           prefix-key: ${{ env.RUST_CACHE_KEY }}
           save-if: ${{ github.ref == 'refs/heads/next' }}
 
@@ -240,12 +250,11 @@ jobs:
           node-version: "20"
       - name: Configure setuid sandbox
         run: . ./scripts/configure-sandbox.sh
-      - name: Add Rust Cache
-        uses: Swatinem/rust-cache@v2
+      - name: Restore node-builder binary
+        uses: actions/cache@v4
         with:
-          shared-key: rust-build
-          prefix-key: ${{ env.RUST_CACHE_KEY }}
-          save-if: ${{ github.ref == 'refs/heads/next' }}
+          path: target/release/testing-node-builder
+          key: ${{ runner.os }}-node-builder-${{ hashFiles('Cargo.lock') }}
       - name: Start test node
         run: make start-node-background
       - name: Run web client tests
@@ -283,9 +292,14 @@ jobs:
       - name: Add Rust Cache
         uses: Swatinem/rust-cache@v2
         with:
-          shared-key: rust-build
+          shared-key: rust-release
           prefix-key: ${{ env.RUST_CACHE_KEY }}
           save-if: ${{ github.ref == 'refs/heads/next' }}
+      - name: Restore node-builder binary
+        uses: actions/cache@v4
+        with:
+          path: target/release/testing-node-builder
+          key: ${{ runner.os }}-node-builder-${{ hashFiles('Cargo.lock') }}
       - name: Start test node
         run: make start-node-background
       - name: Start prover

.github/workflows/wallet-pages.yml

@@ -19,7 +19,6 @@ jobs:
           node-version: "20"
           cache: yarn
           cache-dependency-path: |
-            yarn.lock
             packages/react-sdk/yarn.lock
             packages/react-sdk/examples/wallet/yarn.lock
       - name: Install root dependencies

Makefile

@@ -117,7 +117,7 @@ start-node: ## Start the testing node server
 
 .PHONY: start-node-background
 start-node-background: ## Start the testing node server in background
-	./scripts/start-binary-bg.sh node-builder
+	./scripts/start-binary-bg.sh testing-node-builder
 
 .PHONY: stop-node
 stop-node: ## Stop the testing node server

scripts/start-binary-bg.sh

@@ -3,22 +3,31 @@
 # Starts the binary in the background and checks that it has not exited
 
 if [ -z "$1" ]; then
-    echo "Usage: $0 <package-name>"
+    echo "Usage: $0 <binary-name>"
     exit 1
 fi;
 
-PACKAGE_NAME="$1"
+BINARY_NAME="$1"
 
-if ! cargo build --release --package "$PACKAGE_NAME" --locked; then
-    echo "Failed to build $PACKAGE_NAME"
-    exit 1
+# Resolve the workspace target directory (handles being called from subcrates)
+TARGET_DIR=$(cargo metadata --format-version 1 --no-deps 2>/dev/null | grep -o '"target_directory":"[^"]*"' | head -1 | cut -d'"' -f4)
+TARGET_DIR="${TARGET_DIR:-target}"
+BINARY_PATH="$TARGET_DIR/release/$BINARY_NAME"
+
+if [ -x "$BINARY_PATH" ]; then
+    echo "$BINARY_NAME binary found, skipping build"
+else
+    if ! cargo build --release --bin "$BINARY_NAME" --locked; then
+        echo "Failed to build $BINARY_NAME"
+        exit 1
+    fi;
 fi;
 
-RUST_LOG=none cargo run --release --package "$PACKAGE_NAME" --locked & echo $! > .$PACKAGE_NAME.pid;
+RUST_LOG=none "$BINARY_PATH" & echo $! > .$BINARY_NAME.pid;
 sleep 4;
-if ! ps -p $(cat .$PACKAGE_NAME.pid) > /dev/null; then
-    echo "Failed to start $PACKAGE_NAME";
-    rm -f .$PACKAGE_NAME.pid;
+if ! ps -p $(cat .$BINARY_NAME.pid) > /dev/null; then
+    echo "Failed to start $BINARY_NAME";
+    rm -f .$BINARY_NAME.pid;
     exit 1;
 fi;
-rm -f .$PACKAGE_NAME.pid
+rm -f .$BINARY_NAME.pid

scripts/start-note-transport-bg.sh

@@ -13,7 +13,6 @@ BRANCH=${TRANSPORT_BRANCH:-main}
 
 TRANSPORT_DIR=${TRANSPORT_DIR:-.tmp/miden-note-transport}
 REPO_URL=${REPO_URL:-https://github.com/0xMiden/miden-note-transport}
-RUN_CMD=${TRANSPORT_RUN_CMD:-cargo run --release --locked}
 
 # Shared target directory (important for CI speed: ends up under repo `target/` which is cached)
 TRANSPORT_CARGO_TARGET_DIR=${TRANSPORT_CARGO_TARGET_DIR:-"$REPO_ROOT/target/note-transport"}
@@ -33,11 +32,17 @@ else
   git -C "$TRANSPORT_DIR" reset --hard "origin/$BRANCH"
 fi
 
-echo "Building note transport service..."
-( cd "$TRANSPORT_DIR" && CARGO_TARGET_DIR="$TRANSPORT_CARGO_TARGET_DIR" cargo build --release --locked )
+BINARY_PATH="$TRANSPORT_CARGO_TARGET_DIR/release/miden-note-transport-node-bin"
+
+if [ -x "$BINARY_PATH" ]; then
+  echo "Note transport binary found, skipping build"
+else
+  echo "Building note transport service..."
+  ( cd "$TRANSPORT_DIR" && CARGO_TARGET_DIR="$TRANSPORT_CARGO_TARGET_DIR" cargo build --release --locked )
+fi
 
 echo "Starting note transport service in background..."
-( cd "$TRANSPORT_DIR" && RUST_LOG=info CARGO_TARGET_DIR="$TRANSPORT_CARGO_TARGET_DIR" $RUN_CMD ) & echo $! > "$PID_FILE"
+RUST_LOG=info "$BINARY_PATH" & echo $! > "$PID_FILE"
 
 sleep 4