From 5fa0ae29039b52aaa7ff5d516e10b84fb4892684 Mon Sep 17 00:00:00 2001 From: SkateSpots Date: Tue, 27 Oct 2026 09:10:48 +0700 Subject: [PATCH] fix(release): tolerant Zapstore version match; --force bump with dirty notes --- scripts/release.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/release.sh b/scripts/release.sh index 64698cc..6f02c50 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -80,7 +80,9 @@ log "running the full test gate (this also builds the web bundle)…" npm test log "bumping version ($SPEC)…" -npm version "$SPEC" --no-git-tag-version >/dev/null +# --force: the only dirty file is release-notes.txt, which `npm version` +# otherwise refuses to bump over. The tree was already validated above. +npm version "$SPEC" --no-git-tag-version --force >/dev/null VERSION="$(node -p "require('./package.json').version")" [ "$VERSION" != "$CURRENT" ] || die "version did not change" log "version: $VERSION" @@ -102,7 +104,7 @@ FOUND=0 for _ in 1 2 3 4 5 6; do if command -v nak >/dev/null 2>&1; then OUT="$(timeout 15 nak req -k 30063 -d "org.skatespots.app@$VERSION" wss://relay.zapstore.dev 2>/dev/null || true)" - if printf '%s' "$OUT" | grep -q "\[\"version\",\"$VERSION\"\]"; then FOUND=1; break; fi + if printf '%s' "$OUT" | grep -qE "\"version\"[[:space:]]*,[[:space:]]*\"$VERSION\""; then FOUND=1; break; fi else log "nak not installed — skipping relay verification" FOUND=1