feat: add merge-release GitHub workflow and make target

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: olivermeyer

.github/workflows/merge-release.yml

@@ -0,0 +1,86 @@
+name: "Merge Release"
+
+on:
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: 'Release branch to merge (e.g. "release/v1.1.0"). Auto-detected if omitted.'
+        required: false
+        type: string
+
+permissions:
+  contents: read
+
+jobs:
+  merge-release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
+        with:
+          app-id: ${{ secrets.RELEASE_BOT_APP_ID }}
+          private-key: ${{ secrets.RELEASE_BOT_PRIVATE_KEY }}
+
+      - name: Configure git identity
+        run: |
+          git config --global user.name "aignostics-release-bot[bot]"
+          git config --global user.email "aignostics-release-bot[bot]@users.noreply.github.com"
+
+      - name: Checkout main
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          token: ${{ steps.app-token.outputs.token }}
+          ref: main
+          fetch-depth: 0
+
+      - name: Resolve release branch
+        id: branch
+        run: |
+          INPUT="${{ inputs.branch }}"
+          if [ -n "$INPUT" ]; then
+            BRANCH="$INPUT"
+          else
+            MATCHES=$(git ls-remote --heads origin 'release/v*' | awk '{print $2}' | sed 's|refs/heads/||')
+            if [ -z "$MATCHES" ]; then
+              echo "❌ No release/v* branches found."
+              exit 1
+            fi
+            COUNT=$(echo "$MATCHES" | wc -l | tr -d ' ')
+            if [ "$COUNT" -gt 1 ]; then
+              echo "❌ Multiple release/v* branches found. Specify one explicitly:"
+              echo "$MATCHES"
+              exit 1
+            fi
+            BRANCH="$MATCHES"
+          fi
+          echo "branch=${BRANCH}" >> "$GITHUB_OUTPUT"
+          echo "✅ Using release branch: ${BRANCH}"
+
+      - name: Fetch remote
+        run: git fetch origin
+
+      - name: Merge release branch into main
+        run: |
+          BRANCH="${{ steps.branch.outputs.branch }}"
+          git merge --no-ff "origin/${BRANCH}" -m "chore: merge ${BRANCH} into main"
+
+      - name: Push main
+        run: git push origin main
+
+      - name: Delete remote release branch
+        run: git push origin --delete "${{ steps.branch.outputs.branch }}"
+
+      - name: Print job summary
+        run: |
+          BRANCH="${{ steps.branch.outputs.branch }}"
+          cat >> "$GITHUB_STEP_SUMMARY" << EOF
+          ## ✅ Release merged
+
+          | | |
+          |---|---|
+          | **Branch** | \`${BRANCH}\` |
+          | **Merged into** | \`main\` |
+
+          The release branch has been merged into \`main\` and deleted.
+          EOF

Makefile

@@ -21,7 +21,7 @@ $(error Python version validation failed. See error message above.)
 endif
 
 # Define all PHONY targets
-.PHONY: act all audit bump clean codegen dist dist_native docs docker_build gui_watch install lint lint_fix merge-release pre_commit_run_all prepare-release profile publish-release setup test test_coverage_reset test_default test_e2e test_e2e_matrix test_integration test_integration_matrix test_long_running test_scheduled test_stress test_sequential test_unit test_unit_matrix test_very_long_running update_from_template
+.PHONY: act all audit clean codegen dist dist_native docs docker_build gui_watch install lint lint_fix merge-release pre_commit_run_all prepare-release profile publish-release setup test test_coverage_reset test_default test_e2e test_e2e_matrix test_integration test_integration_matrix test_long_running test_scheduled test_stress test_sequential test_unit test_unit_matrix test_very_long_running update_from_template
 
 
 # Main target i.e. default sessions defined in noxfile.py
@@ -47,7 +47,7 @@ else \
 fi
 
 ## Individual Nox sessions
-act audit bump dist docs lint lint_fix setup test update_from_template:
+act audit dist docs lint lint_fix setup test update_from_template:
 	$(nox-cmd)
 
 # Standalone targets
@@ -125,6 +125,17 @@ publish-release:
 	fi
 	@echo "Workflow triggered. Monitor at: https://github.com/aignostics/python-sdk/actions"
 
+## Trigger the merge-release GitHub workflow to merge release/vX.Y.Z into main and delete the branch
+## Usage: make merge-release [release/vX.Y.Z]
+merge-release:
+	$(eval BRANCH := $(filter-out $@,$(MAKECMDGOALS)))
+	@if [ -n "$(BRANCH)" ]; then \
+		gh workflow run merge-release.yml --field branch=$(BRANCH); \
+	else \
+		gh workflow run merge-release.yml; \
+	fi
+	@echo "Workflow triggered. Monitor at: https://github.com/aignostics/python-sdk/actions"
+
 ## Clean build artifacts and caches
 clean:
 	rm -rf .mypy_cache
@@ -214,9 +225,9 @@ help:
 	@echo "  act                   - Run GitHub actions locally via act"
 	@echo "  all                   - Run all default nox sessions, i.e. lint, test, docs, audit"
 	@echo "  audit                 - Run security and license compliance audit"
-	@echo "  bump patch|minor|major|x.y.z - Bump version (local, legacy)"
 	@echo "  prepare-release patch|minor|major|x.y.z - Create release/vX.Y.Z branch via GitHub workflow"
 	@echo "  publish-release [release/vX.Y.Z]        - Generate changelog, tag, and push via GitHub workflow"
+	@echo "  merge-release [release/vX.Y.Z]          - Merge release branch into main and delete it via GitHub workflow"
 	@echo "  clean                 - Clean build artifacts and caches"
 	@echo "  codegen               - Download openapi.json from Aignostics platform, generate API code"
 	@echo "  dist                  - Build wheel and sdist into dist/"

noxfile.py

@@ -1023,21 +1023,6 @@ def act(session: nox.Session) -> None:
     )
 
 
-@nox.session(default=False)
-def bump(session: nox.Session) -> None:
-    """Bump version and push changes to git."""
-    version_part = session.posargs[0] if session.posargs else "patch"
-
-    # Check if the version_part is a specific version (e.g., 1.2.3)
-    if re.match(r"^\d+\.\d+\.\d+$", version_part):
-        session.run("bump-my-version", "bump", "--new-version", version_part, external=True)
-    else:
-        session.run("bump-my-version", "bump", version_part, external=True)
-
-    # Push changes to git including tag created
-    session.run("git", "push", "--follow-tags", "--no-verify", external=True)
-
-
 @nox.session()
 def dist(session: nox.Session) -> None:
     """Build wheel and put in dist/."""