fix(release): stop merging master into develop so the version bump lands (#8398)

develop requires linear history, so the final "merge master into develop"
step in bin/release.ts produced a merge commit that the push rejected.
push-after-release.sh ignored the failure (no set -e), so master and the
tags shipped while develop stayed on the previous version (3.3.10 after
3.3.11, 3.3.11 after 3.3.12). Drop the merge-back: develop keeps its
"bump version" commit and is pushed as a fast-forward. Push all refs
with --atomic under set -euo pipefail so a rejected ref fails the job
instead of half-shipping.

Also bump develop to 3.3.12 to match the release that just shipped.


Claude-Session: https://claude.ai/code/session_01V4cYEvi9Y4BTPntnkV9tzh

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

Author: JohnMcLear

admin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "admin",
   "private": true,
-  "version": "3.3.11",
+  "version": "3.3.12",
   "type": "module",
   "scripts": {
     "dev": "pnpm gen:api && vite",

bin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bin",
-  "version": "3.3.11",
+  "version": "3.3.12",
   "description": "",
   "main": "checkAllPads.js",
   "directories": {

bin/push-after-release.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -euo pipefail
 
 # Specify the path to your package.json file
 PACKAGE_JSON_PATH="./src/package.json"
@@ -11,6 +12,7 @@ fi
 
 # Read the version from package.json into a variable
 VERSION=$(jq -r '.version' "$PACKAGE_JSON_PATH")
-git push origin master develop $VERSION
-git push --tags
+# --atomic: if any ref is rejected (e.g. by branch protection), push none of
+# them and fail the job instead of shipping a tag with develop left behind.
+git push --atomic origin master develop "$VERSION" "v$VERSION"
 (cd ../ether.github.com && git push)

bin/release.ts

@@ -194,10 +194,10 @@ try {
   console.log(`Creating ${newVersion} tag...`);
   run(`git tag -a '${newVersion}' -m '${newVersion}'`);
   run(`git tag -a 'v${newVersion}' -m 'v${newVersion}'`);
+  // develop requires linear history, so it is not merged back from master: it
+  // keeps the "bump version" commit made above and is pushed as a fast-forward.
   console.log('Switching back to develop...');
   run('git checkout develop');
-  console.log('Merging master into develop...');
-  run('git merge --no-ff --no-edit master');
 } catch (err:any) {
   console.error(err.toString());
   console.warn('Resetting repository...');

package.json

@@ -52,6 +52,6 @@
     "url": "https://github.com/ether/etherpad.git"
   },
   "engineStrict": true,
-  "version": "3.3.11",
+  "version": "3.3.12",
   "license": "Apache-2.0"
 }

src/package.json

@@ -161,6 +161,6 @@
     "debug:socketio": "cross-env DEBUG=socket.io* node --require tsx/cjs node/server.ts",
     "test:vitest": "vitest"
   },
-  "version": "3.3.11",
+  "version": "3.3.12",
   "license": "Apache-2.0"
 }