From 0a865f538fc7c636fc7efe97a810a2c7cf1d12ed Mon Sep 17 00:00:00 2001 From: Thomas Cooper Date: Fri, 17 Apr 2026 14:39:53 -0400 Subject: [PATCH] chore: bump version to 1.0.0-beta.6 --- .claude/commands/release.md | 35 ++++++++++++++++++++++++----------- build.gradle | 2 +- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/.claude/commands/release.md b/.claude/commands/release.md index b6be4927..97c42952 100644 --- a/.claude/commands/release.md +++ b/.claude/commands/release.md @@ -37,28 +37,41 @@ inferred automatically by incrementing the last numeric component of the current 2. **Show the current state.** Run `git tag --sort=-version:refname | head -5` and show the user the current version and the inferred/provided new version alongside the most recent tags. -3. **Update `build.gradle`.** In the `allprojects { ... }` block, replace the existing `version = '...'` line with `version = ''`. Use the Edit tool. +3. **Ensure a release branch exists.** Run `git branch --show-current` to check the current branch. + - If already on a branch named `release/`, continue. + - If on `main` (or any other branch), create and switch to `release/`: + ``` + git checkout -b release/ + ``` -4. **Run `./gradlew spotlessApply`** to ensure formatting is clean before committing. +4. **Update `build.gradle`.** In the `allprojects { ... }` block, replace the existing `version = '...'` line with `version = ''`. Use the Edit tool. -5. **Ask about additional changes.** Run `git diff --stat` and show the output to the user, then ask: "Any other changes to include in this commit?" Wait for their response. If they say yes, apply those changes before staging. If no, proceed. +5. **Run `./gradlew spotlessApply`** to ensure formatting is clean before committing. -6. **Commit the version bump.** Stage `build.gradle` plus any additional files the user specified and commit: +6. **Ask about additional changes.** Run `git diff --stat` and show the output to the user, then ask: "Any other changes to include in this commit?" Wait for their response. If they say yes, apply those changes before staging. If no, proceed. + +7. **Commit the version bump.** Stage `build.gradle` plus any additional files the user specified and commit: ``` chore: bump version to ``` No `closes #N`, no co-author trailer needed for version bumps. -7. **Push the commit.** Run `git push` to push the version bump commit to main. This triggers CI, CodeQL, and CVE - workflows on the new commit SHA. - -8. **Wait for checks.** Tell the user: +8. **Push and open a PR with auto-merge.** Run: + ``` + git push -u origin release/ + ``` + Then create the PR and enable auto-merge: + ``` + gh pr create --base main --title "chore: bump version to " --body "" + gh pr merge --auto --squash + ``` + Tell the user: - > Version bump pushed to main. CI, CodeQL, and CVE checks are now running on this commit. + > PR created for `release/` with auto-merge enabled. It will merge into main automatically once all checks pass. > - > **When all checks are green**, run `/release-tag ` to create and push the tag. + > **Once merged**, run `/release-tag ` to create and push the tag. > - > Monitor check status: `gh run list --branch main --limit 4` + > Monitor check status: `gh run list --branch release/ --limit 4` **Stop here.** Do NOT create a tag or push tags. The tag ruleset on GitHub will reject the tag push if the required status checks haven't passed yet. diff --git a/build.gradle b/build.gradle index 3ceb8269..355038ed 100644 --- a/build.gradle +++ b/build.gradle @@ -70,7 +70,7 @@ ext { allprojects { group = 'org.finos.gitproxy' - version = '1.0.0-beta.5' + version = '1.0.0-beta.6' repositories { mavenCentral()