Repository navigation
chore(release): register 3.2.x and carry post-tag GA hygiene onto 3.2.x #7860
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
8fb4cc3
chore(ci): add 3.2.x maintenance line to release and CI workflows
bokelley 8e76141
revert(release): restore the full storyboard gate in verify-release (…
bokelley 49b681c
chore(ci): leave training-agent-storyboards.yml out of the 3.2.x regi…
bokelley 532b8cc
test: stop assuming the 3.2 line has no stable release (#7839)
bokelley 2564d32
chore: snapshot docs for v3.2.1 (#7842)
aao-release-bot[bot] ec7aa2a
docs: align the GA banner with the 3.2 message (#7843)
bokelley 9a4eb5c
fix(compliance): track active SDK publication tags
bokelley 6c681cb
test(docs): allow exact 3.2 release branch bootstrap
bokelley 666316c
test(docs): pin GA branch bootstrap commit for shallow CI
bokelley ee5c10c
ci(release): gate 3.2 storyboards before maintenance merges
bokelley 0686d37
Merge 3.2.x docs snapshot into release-line PR
bokelley File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,239 @@ | ||
| name: Forward-merge 3.2.x to main | ||
|
|
||
| # Brings 3.2.x patches back into main so the next minor continues to include | ||
| # all 3.2.x fixes. Direction is one-way: 3.2.x → main. Never the reverse. | ||
| # | ||
| # On every push to 3.2.x (typically a Version Packages merge or a | ||
| # cherry-picked patch), this workflow merges 3.2.x into a fresh branch | ||
| # off main and opens a PR. A human reviews and merges. If the merge has | ||
| # conflicts, the workflow fails fast and the PR is not opened — a human | ||
| # must resolve manually. | ||
| # | ||
| # The PR is opened with a GitHub App installation token (RELEASE_APP_ID), | ||
| # so its open/sync events fire required `pull_request` workflows | ||
| # (TypeScript Build, IPR Policy, Check for changeset). #3417 closed. | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - '3.2.x' | ||
| workflow_dispatch: | ||
|
|
||
| concurrency: | ||
| group: forward-merge-3.2 | ||
| cancel-in-progress: false | ||
|
|
||
| permissions: | ||
| contents: write | ||
| pull-requests: write | ||
|
|
||
| jobs: | ||
| forward-merge: | ||
| name: Forward-merge 3.2.x → main | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| # Mint a GitHub App installation token so the auto-opened PR fires | ||
| # required CI workflows (TypeScript Build, IPR Policy, Check for | ||
| # changeset). GITHUB_TOKEN-triggered events are blocked by GitHub's | ||
| # recursion rule. Closes #3417. | ||
| - name: Mint AgenticAdvertising.org Release Bot installation token | ||
| id: app-token | ||
| uses: actions/create-github-app-token@v3.2.0 | ||
| with: | ||
| app-id: ${{ secrets.RELEASE_APP_ID }} | ||
| private-key: ${{ secrets.RELEASE_APP_PRIVATE_KEY }} | ||
| owner: adcontextprotocol | ||
| repositories: adcp | ||
|
|
||
| - name: Checkout main with full history | ||
| uses: actions/checkout@v7.0.1 | ||
| with: | ||
| fetch-depth: 0 | ||
| ref: main | ||
| token: ${{ steps.app-token.outputs.token }} | ||
|
|
||
| - name: Configure git | ||
| run: | | ||
| git config user.name "github-actions[bot]" | ||
| git config user.email "41898282+github-actions[bot]@users.noreply.github.com" | ||
|
|
||
| - name: Fetch 3.2.x | ||
| run: git fetch origin 3.2.x | ||
|
|
||
| - name: Create forward-merge branch and merge | ||
| id: merge | ||
| run: | | ||
| set -e | ||
| git checkout -B forward-merge/3.2.x origin/main | ||
|
|
||
| MERGE_MSG="Forward-merge 3.2.x@$(git rev-parse --short origin/3.2.x) → main" | ||
| if git merge --no-ff origin/3.2.x -m "$MERGE_MSG"; then | ||
| echo "Merge completed without conflicts." | ||
| else | ||
| CONFLICTS=$(git diff --name-only --diff-filter=U) | ||
| if [ -z "$CONFLICTS" ]; then | ||
| echo "::error::git merge failed but produced no conflicted files. Investigate manually." | ||
| git merge --abort 2>/dev/null || true | ||
| exit 1 | ||
| fi | ||
| echo "Conflicts to auto-resolve:" | ||
| echo "$CONFLICTS" | ||
|
|
||
| UNEXPECTED="" | ||
| while IFS= read -r f; do | ||
| [ -z "$f" ] && continue | ||
| case "$f" in | ||
| # `.changeset/*.md` and `.changeset/pre.json`: preserve main's | ||
| # state. Main consumes changesets on its own schedule; 3.2.x | ||
| # consuming a changeset on its release line shouldn't delete | ||
| # the same file from main's pending pool. | ||
| .changeset/*.md|.changeset/pre.json) | ||
| STATUS=$(git status --porcelain -- "$f" | head -c 2) | ||
| case "$STATUS" in | ||
| DU|DD|D*) | ||
| git rm -f -- "$f" >/dev/null | ||
| ;; | ||
| *) | ||
| git checkout --ours -- "$f" | ||
| git add -- "$f" | ||
| ;; | ||
| esac | ||
| ;; | ||
| # package.json / package-lock.json: keep main's. | ||
| # Main may carry structural changes (package renames, new deps) | ||
| # that 3.2.x doesn't. Main's version state is set by its own | ||
| # changeset schedule, not by 3.2.x's patch bumps. | ||
| package.json|package-lock.json) | ||
| git checkout --ours -- "$f" | ||
| git add -- "$f" | ||
| ;; | ||
| # Schema source index files carry branch-local version | ||
| # metadata. Preserve main's copy. | ||
| static/schemas/source/index.json|static/schemas/source/registry/index.yaml) | ||
| git checkout --ours -- "$f" | ||
| git add -- "$f" | ||
| ;; | ||
| # CHANGELOG.md: take 3.2.x's (canonical patch-line history); | ||
| # main's next Version Packages cut prepends its own entries. | ||
| CHANGELOG.md) | ||
| git checkout --theirs -- "$f" | ||
| git add -- "$f" | ||
| ;; | ||
| # dist/ release artifacts: always take 3.2.x's. These are | ||
| # immutable per release; main only ever ADDS to its dist tree. | ||
| dist/schemas/*|dist/compliance/*|dist/protocol/*|dist/docs/*) | ||
| git checkout --theirs -- "$f" | ||
| git add -- "$f" | ||
| ;; | ||
| *) | ||
| UNEXPECTED="$UNEXPECTED $f" | ||
| ;; | ||
| esac | ||
| done <<< "$CONFLICTS" | ||
|
|
||
| if [ -n "$UNEXPECTED" ]; then | ||
| echo "::error::Forward-merge has content conflicts that require human review:$UNEXPECTED" | ||
| echo "::error::Each conflict is a real decision about whether 3.2.x's change should land on main." | ||
| echo "::error::Resolve manually:" | ||
| echo "::error:: git fetch origin && git checkout -b forward-merge/3.2.x origin/main" | ||
| echo "::error:: git merge origin/3.2.x # resolve conflicts in editor" | ||
| echo "::error:: git push origin forward-merge/3.2.x" | ||
| echo "::error:: gh pr create --base main --head forward-merge/3.2.x" | ||
| git merge --abort | ||
| exit 1 | ||
| fi | ||
|
|
||
| REMAINING=$(git diff --name-only --diff-filter=U) | ||
| if [ -n "$REMAINING" ]; then | ||
| echo "::error::After auto-resolution, files still conflicted: $REMAINING" | ||
| git merge --abort | ||
| exit 1 | ||
| fi | ||
|
|
||
| git commit --no-edit -m "$MERGE_MSG (auto-resolved divergent metadata)" | ||
| echo "Auto-resolution complete." | ||
|
|
||
| echo "" | ||
| echo "::group::Post-resolution git status" | ||
| git status --short | ||
| echo "::endgroup::" | ||
| echo "" | ||
| echo "::group::package.json diff vs origin/main" | ||
| git diff origin/main HEAD -- package.json package-lock.json || true | ||
| echo "::endgroup::" | ||
| fi | ||
|
|
||
| if git diff --quiet origin/main HEAD; then | ||
| echo "Forward-merge produced no tree change — main already has 3.2.x's content." | ||
| echo "skip=true" >> "$GITHUB_OUTPUT" | ||
| else | ||
| echo "skip=false" >> "$GITHUB_OUTPUT" | ||
| git push --force origin "HEAD:refs/heads/forward-merge/3.2.x" | ||
| fi | ||
|
|
||
| - name: Create or update pull request | ||
| if: steps.merge.outputs.skip != 'true' | ||
| env: | ||
| GH_TOKEN: ${{ steps.app-token.outputs.token }} | ||
| PR_HEAD: forward-merge/3.2.x | ||
| PR_TITLE: "Forward-merge 3.2.x → main" | ||
| run: | | ||
| set -euo pipefail | ||
|
|
||
| EXISTING_PR="$(gh pr list \ | ||
| --repo "$GITHUB_REPOSITORY" \ | ||
| --state open \ | ||
| --base main \ | ||
| --head "$PR_HEAD" \ | ||
| --limit 1 \ | ||
| --json url \ | ||
| --jq '.[0].url // empty')" | ||
|
|
||
| if [ -n "$EXISTING_PR" ]; then | ||
| echo "Forward-merge PR already open: $EXISTING_PR" | ||
| exit 0 | ||
| fi | ||
|
|
||
| BODY_FILE="$RUNNER_TEMP/forward-merge-3.2.md" | ||
| cat > "$BODY_FILE" <<'EOF' | ||
| Auto-generated forward-merge of `3.2.x` into `main`. | ||
|
|
||
| Brings 3.2.x patches into main so the next minor continues to include | ||
| all 3.2.x fixes. **Direction is one-way**: `3.2.x → main`. Never the | ||
| reverse. | ||
|
|
||
| ## Auto-resolved divergent metadata | ||
|
|
||
| Conflicts on these always-divergent paths are resolved automatically: | ||
|
|
||
| - `package.json` / `package-lock.json` → preserve main's | ||
| - `.changeset/*.md` / `.changeset/pre.json` → preserve main's state | ||
| - `static/schemas/source/index.json`, | ||
| `static/schemas/source/registry/index.yaml` → preserve main's | ||
| - `CHANGELOG.md` → take 3.2.x's | ||
| - `dist/*` → take 3.2.x's (versioned release artifacts) | ||
|
|
||
| Any conflict outside this list fails the workflow loud. | ||
|
|
||
| ## Review checklist | ||
|
|
||
| - [ ] Diff matches what you'd expect from the 3.2.x patches | ||
| - [ ] No next-minor work has been pulled in by accident | ||
| - [ ] CI green | ||
|
|
||
| ## Source | ||
|
|
||
| See `.github/workflows/forward-merge-3.2.yml` for the trigger | ||
| and auto-resolution logic. See `.agents/playbook.md` § Release | ||
| lines for the cherry-pick convention. | ||
|
|
||
| 🤖 Generated by `.github/workflows/forward-merge-3.2.yml` | ||
| EOF | ||
|
|
||
| gh pr create \ | ||
| --repo "$GITHUB_REPOSITORY" \ | ||
| --base main \ | ||
| --head "$PR_HEAD" \ | ||
| --title "$PR_TITLE" \ | ||
| --body-file "$BODY_FILE" \ | ||
| --label forward-merge |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.