[puter] ci: don't install rust deps if cache hit

Author: velzie

.github/workflows/main.yml

@@ -38,36 +38,40 @@ jobs:
       - name: Install pnpm dependencies
         run: pnpm install
 
+      - name: Cache rewriter build artifacts
+        uses: actions/cache@v4
+        id: rewriter-cache
+        with:
+          path: |
+            rewriter/wasm/out
+            dist/scramjet.wasm.wasm
+          key: rewriter-release-${{ hashFiles('rewriter/wasm/Cargo.toml', 'rewriter/wasm/src/**/*.rs', 'rewriter/wasm/build.sh') }}
+          restore-keys: |
+            rewriter-release-
+
       - name: Cache Rust dependencies
+        if: steps.rewriter-cache.outputs.cache-hit != 'true'
         uses: Swatinem/rust-cache@v2
         with:
           workspaces: "rewriter"
           cache-all-crates: true
 
       - name: Install wbg
+        if: steps.rewriter-cache.outputs.cache-hit != 'true'
         uses: jetli/[email protected]
         with:
           version: "0.2.100"
 
       - name: Setup Binaryen
+        if: steps.rewriter-cache.outputs.cache-hit != 'true'
         uses: Aandreba/[email protected]
         with:
           token: ${{ github.token }}
 
       - name: Setup wasm-snip
+        if: steps.rewriter-cache.outputs.cache-hit != 'true'
         run: "cargo install --git https://github.com/r58playz/wasm-snip"
 
-      - name: Cache rewriter build artifacts
-        uses: actions/cache@v4
-        id: rewriter-cache
-        with:
-          path: |
-            rewriter/wasm/out
-            dist/scramjet.wasm.wasm
-          key: rewriter-release-${{ hashFiles('rewriter/wasm/Cargo.toml', 'rewriter/wasm/src/**/*.rs', 'rewriter/wasm/build.sh') }}
-          restore-keys: |
-            rewriter-release-
-
       - name: Pack Scramjet
         run: pnpm pack
 

rewriter/wasm/build.sh

@@ -21,14 +21,8 @@ else
 	: "${FEATURES:=}"
 fi
 
-# ----------------------------------------------------------------------------------
-# Build cache short‑circuit: if sources & build parameters unchanged, skip heavy work
-# We rely on CI (and local dev optional) to restore rewriter/wasm/out + dist/ wasm file.
-# Hash includes Rust source files, manifest, this script, and release/debug mode.
-# ----------------------------------------------------------------------------------
 MODE="release"
 if [ "${RELEASE:-0}" != "1" ]; then MODE="debug"; fi
-HASH_INPUT_FILES=(src/**/*.rs Cargo.toml build.sh)
 # shellcheck disable=SC2046
 SRC_HASH=$( (echo "MODE=${MODE}"; sha256sum $(git ls-files -z -- "src" | tr '\0' ' ' 2>/dev/null || find src -type f -name '*.rs'; echo Cargo.toml; echo build.sh) 2>/dev/null | sort -k2 | sha256sum ) | sha256sum | cut -d' ' -f1 ) || SRC_HASH="unknown"
 
@@ -37,6 +31,17 @@ if [ -f out/.build-hash ] && [ -f ../../dist/scramjet.wasm.wasm ] && [ "$SRC_HAS
   exit 0
 fi
 
+which cargo wasm-bindgen wasm-opt wasm-snip &> /dev/null || {
+	echo "Please install cargo, wasm-bindgen, wasm-opt from https://github.com/WebAssembly/binaryen, and wasm-snip from https://github.com/r58playz/wasm-snip!"
+	exit 1
+}
+
+WBG="wasm-bindgen 0.2.100"
+if ! [[ "$(wasm-bindgen -V)" =~ ^"$WBG" ]]; then
+	echo "Incorrect wasm-bindgen-cli version: '$(wasm-bindgen -V)' != '$WBG'"
+	exit 1
+fi
+
 (
 	export RUSTFLAGS='-Zlocation-detail=none -Zfmt-debug=none'
 	if [ "${OPTIMIZE_FOR_SIZE:-0}" = "1" ]; then