Simplify release DX: local manifest, optional hash, slimmer publish
release.sh writes updates/manifest.json at release time (predictable asset URL) — no CI commit-back, no push-token problem, no detached checkout dance. release_publish.sh is create-release + upload only. Manifest sha256 now optional; updater skips verification with a note when absent (HTTPS + gzip CRC cover the realistic cases). Fixed the repo-URL sed keeping a .git suffix (caught by a worktree dry run). Updater tests: 8 (sha-less manifest flow added).
This commit is contained in:
foxyz committed
1 parent
afb4a9e051
commit
32848aaf71
9 files changed
+111
-71
No files matched your search
+41
-6
@@ -1,8 +1,9 @@
|
||||
#!/usr/bin/env bash
|
||||
# Cut a release without typing a version anywhere: derives the next
|
||||
# version (patch by default), bumps all three pubspecs in lockstep,
|
||||
# commits, and tags. Review, then `git push --follow-tags` — CI takes
|
||||
# it from there (build, Forgejo release, manifest commit-back).
|
||||
# writes updates/manifest.json (predictable asset URL — no CI roundtrip
|
||||
# needed), commits, and tags. Review, then `git push --follow-tags` —
|
||||
# CI takes it from there (build, Forgejo release, asset upload).
|
||||
# Usage: tool/release.sh [patch|minor|major] [--dry-run]
|
||||
set -euo pipefail
|
||||
|
||||
@@ -46,11 +47,45 @@ fi
|
||||
for f in $PUBSPECS; do
|
||||
sed -i -E "s/^version: .*/version: $VER/" "$ROOT/$f"
|
||||
done
|
||||
git -C "$ROOT" add $PUBSPECS
|
||||
if git -C "$ROOT" diff --cached --quiet; then
|
||||
echo "pubspecs already at $VER — tagging only"
|
||||
|
||||
ORIGIN="$(git -C "$ROOT" remote get-url origin)"
|
||||
SERVER="$(echo "$ORIGIN" | sed -E 's#(https?://[^/]+)/.*#\1#')"
|
||||
REPO="$(echo "${ORIGIN%.git}" | sed -E 's#.*[:/]([^/]+/[^/]+)$#\1#')"
|
||||
PROTO="$(sed -n 's/.*protoVersion = \([0-9]*\).*/\1/p' "$ROOT/packages/core/lib/src/constants.dart")"
|
||||
ASSET="watch-together-$VER-linux-x64.tar.gz"
|
||||
if [[ -n "$LATEST" && "$LATEST" != "v$VER" ]]; then
|
||||
NOTES="$(git -C "$ROOT" log "$LATEST..HEAD" --format='- %s' | head -n 20)"
|
||||
else
|
||||
git -C "$ROOT" commit -m "Release v$VER" -- $PUBSPECS
|
||||
NOTES="Watch together $VER."
|
||||
fi
|
||||
export MANIFEST_FILE="$ROOT/updates/manifest.json" MANIFEST_VER="$VER" \
|
||||
MANIFEST_PROTO="$PROTO" MANIFEST_NOTES="$NOTES" \
|
||||
MANIFEST_URL="$SERVER/$REPO/releases/download/v$VER/$ASSET"
|
||||
python3 - <<'EOF'
|
||||
import json, os
|
||||
path = os.environ['MANIFEST_FILE']
|
||||
try:
|
||||
with open(path) as f:
|
||||
manifest = json.load(f)
|
||||
except (FileNotFoundError, ValueError):
|
||||
manifest = {}
|
||||
manifest.update({
|
||||
'version': os.environ['MANIFEST_VER'],
|
||||
'protocol': int(os.environ['MANIFEST_PROTO']),
|
||||
'url': os.environ['MANIFEST_URL'],
|
||||
'notes': os.environ['MANIFEST_NOTES'].splitlines()[0] if os.environ['MANIFEST_NOTES'] else '',
|
||||
})
|
||||
manifest.pop('sha256', None)
|
||||
with open(path, 'w') as f:
|
||||
json.dump(manifest, f, indent=2)
|
||||
f.write('\n')
|
||||
EOF
|
||||
|
||||
git -C "$ROOT" add $PUBSPECS updates/manifest.json
|
||||
if git -C "$ROOT" diff --cached --quiet; then
|
||||
echo "everything already at $VER — tagging only"
|
||||
else
|
||||
git -C "$ROOT" commit -m "Release v$VER" -- $PUBSPECS updates/manifest.json
|
||||
fi
|
||||
git -C "$ROOT" tag -a -m "Release v$VER" "v$VER"
|
||||
echo "review with: git show v$VER — then: git push --follow-tags"
|
||||
+10
-45
@@ -1,12 +1,12 @@
|
||||
#!/usr/bin/env bash
|
||||
# Publish a release to Forgejo: create the release, upload the Linux
|
||||
# tarball built by tool/package_linux.sh, and commit the updated
|
||||
# updates/manifest.json back to main so --upgrade clients see the new
|
||||
# version at the stable raw URL.
|
||||
# Publish a release to Gitea: create the release and upload the Linux
|
||||
# tarball built by tool/package_linux.sh. The manifest is written by
|
||||
# tool/release.sh at release time (predictable asset URL), so this
|
||||
# script never touches git — no push-back, no write-token problem
|
||||
# beyond the release API itself.
|
||||
# Usage: tool/release_publish.sh vX.Y.Z (run after package_linux.sh)
|
||||
# Env: RELEASE_TOKEN (preferred) or the Actions-provided GITHUB_TOKEN /
|
||||
# GITEA_TOKEN (needs repo write or the final push is denied — then set a
|
||||
# RELEASE_TOKEN secret with write access).
|
||||
# GITEA_TOKEN.
|
||||
set -euo pipefail
|
||||
|
||||
TAG="${1:?usage: tool/release_publish.sh vX.Y.Z}"
|
||||
@@ -18,16 +18,14 @@ TARBALL="$ROOT/dist/watch-together-$VER-linux-x64.tar.gz"
|
||||
[[ -f "$TARBALL" ]] || { echo "error: run tool/package_linux.sh first ($TARBALL missing)" >&2; exit 1; }
|
||||
|
||||
PUB="$(sed -n 's/^version: \([0-9.]*\).*/\1/p' "$ROOT/apps/desktop/pubspec.yaml")"
|
||||
[[ "$PUB" == "$VER" ]] || { echo "error: tag $TAG != desktop pubspec $PUB (bump it in a release commit first)" >&2; exit 1; }
|
||||
[[ "$PUB" == "$VER" ]] || { echo "error: tag $TAG != desktop pubspec $PUB (run tool/release.sh first)" >&2; exit 1; }
|
||||
|
||||
ORIGIN="$(git -C "$ROOT" remote get-url origin)"
|
||||
SERVER="$(echo "$ORIGIN" | sed -E 's#(https?://[^/]+)/.*#\1#')"
|
||||
REPO="$(echo "$ORIGIN" | sed -E 's#.*[:/]([^/]+/[^/]+?)(\.git)?$#\1#')"
|
||||
REPO="$(echo "${ORIGIN%.git}" | sed -E 's#.*[:/]([^/]+/[^/]+)$#\1#')"
|
||||
TOKEN="${RELEASE_TOKEN:-${GITHUB_TOKEN:-${GITEA_TOKEN:-}}}"
|
||||
[[ -n "$TOKEN" ]] || { echo "error: set RELEASE_TOKEN (or run in Actions with a write token)" >&2; exit 1; }
|
||||
[[ -n "$TOKEN" ]] || { echo "error: set RELEASE_TOKEN (or run in Actions)" >&2; exit 1; }
|
||||
|
||||
PROTO="$(sed -n 's/.*protoVersion = \([0-9]*\).*/\1/p' "$ROOT/packages/core/lib/src/constants.dart")"
|
||||
SHA="$(sha256sum "$TARBALL" | cut -d' ' -f1)"
|
||||
ASSET="$(basename "$TARBALL")"
|
||||
PREV="$(git -C "$ROOT" describe --tags --abbrev=0 HEAD 2>/dev/null || true)"
|
||||
if [[ -n "$PREV" && "$PREV" != "$TAG" ]]; then
|
||||
@@ -48,37 +46,4 @@ echo "uploading $ASSET ..."
|
||||
curl -fsS -H "Authorization: token $TOKEN" -H 'Content-Type: application/gzip' \
|
||||
--data-binary "@$TARBALL" \
|
||||
"$SERVER/api/v1/repos/$REPO/releases/$REL_ID/assets?name=$ASSET" > /dev/null
|
||||
|
||||
export MANIFEST_FILE="$ROOT/updates/manifest.json" MANIFEST_VER="$VER" \
|
||||
MANIFEST_PROTO="$PROTO" MANIFEST_SHA="$SHA" \
|
||||
MANIFEST_URL="$SERVER/$REPO/releases/download/$TAG/$ASSET"
|
||||
python3 - <<'EOF'
|
||||
import json, os
|
||||
path = os.environ['MANIFEST_FILE']
|
||||
try:
|
||||
with open(path) as f:
|
||||
manifest = json.load(f)
|
||||
except (FileNotFoundError, ValueError):
|
||||
manifest = {}
|
||||
manifest.update({
|
||||
'version': os.environ['MANIFEST_VER'],
|
||||
'protocol': int(os.environ['MANIFEST_PROTO']),
|
||||
'url': os.environ['MANIFEST_URL'],
|
||||
'sha256': os.environ['MANIFEST_SHA'],
|
||||
'notes': os.environ['REL_NOTES'].splitlines()[0] if os.environ['REL_NOTES'] else '',
|
||||
})
|
||||
with open(path, 'w') as f:
|
||||
json.dump(manifest, f, indent=2)
|
||||
f.write('\n')
|
||||
EOF
|
||||
|
||||
echo "committing manifest back to main ..."
|
||||
git -C "$ROOT" fetch origin main 2>/dev/null || true
|
||||
git -C "$ROOT" checkout -B main origin/main
|
||||
git -C "$ROOT" add updates/manifest.json
|
||||
git -C "$ROOT" -c user.name='watch-together-release' -c user.email='release@localhost' \
|
||||
commit -m "Release $TAG manifest" -- updates/manifest.json
|
||||
if ! git -C "$ROOT" push -o ci.skip origin main 2>/dev/null; then
|
||||
git -C "$ROOT" push origin main
|
||||
fi
|
||||
echo "published $TAG — manifest live at updates/manifest.json on main."
|
||||
echo "published $TAG."
|
||||
Reference in new issue
Block a user