From 491f5d43db44d6d14f2625db103c4baaafb48478 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 28 Jul 2026 20:53:25 -0700
Subject: [PATCH] Require current branch head for ArchiveBox release

---
 bin/release.sh   | 6 +++++-
 etc/package.json | 2 +-
 pyproject.toml   | 4 ++--
 uv.lock          | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/bin/release.sh b/bin/release.sh
index d67255eb..fa70d83e 100755
--- a/bin/release.sh
+++ b/bin/release.sh
@@ -93,7 +93,11 @@ fi
 [[ "$($GIT_BINARY rev-parse HEAD)" == "$RELEASE_SHA" ]]
 [[ -z "$($GIT_BINARY status --short)" ]]
 $GIT_BINARY fetch --quiet --no-tags origin "+refs/heads/${RELEASE_BRANCH}:refs/remotes/origin/${RELEASE_BRANCH}"
-$GIT_BINARY merge-base --is-ancestor "$RELEASE_SHA" "refs/remotes/origin/${RELEASE_BRANCH}"
+BRANCH_HEAD="$($GIT_BINARY rev-parse "refs/remotes/origin/${RELEASE_BRANCH}")"
+if [[ "$RELEASE_SHA" != "$BRANCH_HEAD" ]]; then
+    echo "Skipping ArchiveBox release $VERSION from obsolete CI SHA $RELEASE_SHA; current origin/${RELEASE_BRANCH} is $BRANCH_HEAD" >&2
+    exit 0
+fi
 
 TAG_TARGET="$($GIT_BINARY ls-remote origin "refs/tags/${TAG}^{}")"
 TAG_TARGET="${TAG_TARGET%%[[:space:]]*}"
diff --git a/etc/package.json b/etc/package.json
index 34df8f86..c64adc65 100644
--- a/etc/package.json
+++ b/etc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "archivebox",
-  "version": "0.9.35rc165",
+  "version": "0.9.35rc166",
   "repository": "github:ArchiveBox/ArchiveBox",
   "license": "MIT",
   "dependencies": {
diff --git a/pyproject.toml b/pyproject.toml
index 94e0be68..9ef3acaf 100755
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "archivebox"
-version = "0.9.35rc165"
+version = "0.9.35rc166"
 requires-python = ">=3.13"
 description = "Self-hosted internet archiving solution."
 authors = [{name = "Nick Sweeting", email = "pyproject.toml@archivebox.io"}]
@@ -348,7 +348,7 @@ Donate = "https://github.com/ArchiveBox/ArchiveBox/wiki/Donations"
 
 
 [tool.bumpver]
-current_version = "v0.9.35rc165"
+current_version = "v0.9.35rc166"
 version_pattern = "vMAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 tag_message = "{new_version}"
diff --git a/uv.lock b/uv.lock
index 72413f43..541b1166 100644
--- a/uv.lock
+++ b/uv.lock
@@ -123,7 +123,7 @@ wheels = [
 
 [[package]]
 name = "archivebox"
-version = "0.9.35rc165"
+version = "0.9.35rc166"
 source = { editable = "." }
 dependencies = [
     { name = "abx-dl" },