Skip to content

Commit 554a728

Browse files
committed
fix bad hashing for rewriter cache
1 parent 7f36cb8 commit 554a728

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
path: |
8888
rewriter/wasm/out
8989
dist/scramjet.wasm.wasm
90-
key: rewriter-release-${{ hashFiles('rewriter/**/Cargo.toml', 'rewriter/**/src/**/*.rs', 'rewriter/**/src/**/*.toml', 'rewriter/**/src/**/*.json', 'rewriter/**/src/**/*.md', 'rewriter/**/*.sh') }}
90+
key: rewriter-release-${{ hashFiles('rewriter/**/Cargo.toml', 'rewriter/**/*.rs', 'rewriter/**/src/**/*.toml', 'rewriter/**/src/**/*.json', 'rewriter/**/src/**/*.md', 'rewriter/**/*.sh') }}
9191
restore-keys: |
9292
rewriter-release-
9393

packages/scramjet/rewriter/wasm/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ fi
1515
MODE="release"
1616
if [ "${RELEASE:-0}" != "1" ]; then MODE="debug"; fi
1717
# shellcheck disable=SC2046
18-
SRC_HASH=$( (echo "MODE=${MODE}"; sha256sum $(find src -type f -not -path "*/\.*" -and \( -name "*.rs" -o -name "*.toml" -o -name "*.sh" -o -name "*.json" -o -name "*.md" \); echo Cargo.toml; echo build.sh) 2>/dev/null | sort -k2 | sha256sum ) | sha256sum | cut -d' ' -f1 ) || SRC_HASH="unknown"
18+
SRC_HASH=$( (echo "MODE=${MODE}"; sha256sum $(find ../ -type f -not -path "*/\.*" -and \( -name "*.rs" -o -name "*.toml" -o -name "*.sh" -o -name "*.json" -o -name "*.md" \); echo Cargo.toml; echo build.sh) 2>/dev/null | sort -k2 | sha256sum ) | sha256sum | cut -d' ' -f1 ) || SRC_HASH="unknown"
1919

2020
if [ -f out/.build-hash ] && [ -f ../../dist/scramjet.wasm.wasm ] && [ "$SRC_HASH" != "unknown" ] && grep -q "$SRC_HASH" out/.build-hash; then
2121
echo "Rewriter sources unchanged (hash $SRC_HASH); skipping rebuild."

0 commit comments

Comments
 (0)