fix(release): tolerant Zapstore version match; --force bump with dirty notes
This commit is contained in:
parent
ac5ad39515
commit
5fa0ae2903
1 changed files with 4 additions and 2 deletions
|
|
@ -80,7 +80,9 @@ log "running the full test gate (this also builds the web bundle)…"
|
||||||
npm test
|
npm test
|
||||||
|
|
||||||
log "bumping version ($SPEC)…"
|
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="$(node -p "require('./package.json').version")"
|
||||||
[ "$VERSION" != "$CURRENT" ] || die "version did not change"
|
[ "$VERSION" != "$CURRENT" ] || die "version did not change"
|
||||||
log "version: $VERSION"
|
log "version: $VERSION"
|
||||||
|
|
@ -102,7 +104,7 @@ FOUND=0
|
||||||
for _ in 1 2 3 4 5 6; do
|
for _ in 1 2 3 4 5 6; do
|
||||||
if command -v nak >/dev/null 2>&1; then
|
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)"
|
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
|
else
|
||||||
log "nak not installed — skipping relay verification"
|
log "nak not installed — skipping relay verification"
|
||||||
FOUND=1
|
FOUND=1
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue