From 15b388874c6ce77fadbd0dd0c5106bc4e8800d89 Mon Sep 17 00:00:00 2001 From: bschnurr Date: Thu, 23 Apr 2026 17:59:28 -0700 Subject: [PATCH] Update release agent: explicit PR steps for dev bump Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .github/agents/release.agent.md | 19 ++++++++++++------- build/azure-devdiv-pipeline.stable.yml | 1 - 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/agents/release.agent.md b/.github/agents/release.agent.md index 43acb72f..1c82f0e7 100644 --- a/.github/agents/release.agent.md +++ b/.github/agents/release.agent.md @@ -76,7 +76,7 @@ The stable release pipeline triggers automatically when the release branch is pu ### Phase 3 — Advance `main` back to dev -Goal: Keep `main` moving forward on an odd minor with `-dev` suffix. +Goal: Keep `main` moving forward on the next **odd** minor version with `-dev` suffix. Stable releases use even minor versions; dev versions use odd. 1. From `main` (or a new branch off it, replacing `2026.5.0-dev` with the actual next dev version): ``` @@ -88,13 +88,18 @@ Goal: Keep `main` moving forward on an odd minor with `-dev` suffix. - From: the stable version just released (e.g. `2026.4.0` — *example*) - To: the next odd minor with `-dev` suffix (e.g. `2026.5.0-dev` — *example*) -3. Commit, push, and merge via PR (replace `2026.5.0-dev` with the actual next dev version): - ``` - git add package.json - git commit -m "Bump version to 2026.5.0-dev" - git push origin bump/2026.5.0-dev +3. Commit and push (replace `2026.5.0-dev` with the actual next dev version): + ``` + git add package.json + git commit -m "Bump version to 2026.5.0-dev" + git push origin bump/2026.5.0-dev + ``` + +4. Create a PR targeting `main`, add the `debt` label, and enable auto-merge: + ``` + gh pr create --base main --title "Bump version to 2026.5.0-dev" --body "Advance main to the next odd minor pre-release development version." --label debt + gh pr merge --squash --auto ``` - Open a PR targeting `main` and merge it. > ✋ **Confirm**: Has `main` been updated to the next dev version? diff --git a/build/azure-devdiv-pipeline.stable.yml b/build/azure-devdiv-pipeline.stable.yml index c24efdb2..f2bba783 100644 --- a/build/azure-devdiv-pipeline.stable.yml +++ b/build/azure-devdiv-pipeline.stable.yml @@ -140,4 +140,3 @@ extends: ghCreateRelease: true ghReleaseAddChangeLog: true customNPMRegistry: $(AZURE_ARTIFACTS_FEED) -