Update codegen files - #373
Merged
Merged
Conversation
3 tasks
ptr727
added a commit
that referenced
this pull request
May 24, 2026
Brings main's accumulated codegen/dependabot/dependency-bump commits (PRs #366..#373) onto a sync branch so develop's CI workflow rewrite can land on main as a clean merge. Conflicts in the two wholesale- replaced workflow files were resolved by keeping develop's template-aligned versions: - .github/workflows/merge-bot-pull-request.yml - .github/workflows/run-codegen-pull-request-task.yml This branch exists solely to carry the resolved merge into main via PR. It will be deleted after merge. The dual-target Dependabot and codegen workflows on develop will absorb main's content drift going forward, so this is the last manual sync of its kind.
ptr727
added a commit
that referenced
this pull request
May 24, 2026
## Summary Replaces #375 (which had textual conflicts in the two wholesale-replaced workflow files). This branch is a merge-commit of \`main\` into a sync branch off \`develop\`, with conflicts resolved by keeping develop's template-aligned versions of: - \`.github/workflows/merge-bot-pull-request.yml\` - \`.github/workflows/run-codegen-pull-request-task.yml\` All other files (CreateMatrix project bumps, version data, codegen output) merged cleanly. ## What's landing on main 10 commits total: 8 already on main (re-applied via the merge), plus develop's two: - **f8b06bd** Align CI workflows with ProjectTemplate App-token pattern (#374) — the big bot-PR / merge / dependency-update overhaul - **2fb7989** Address Copilot review comments on PR #366 - Plus the in-tree result of merging main's #366..#373 forward (codegen, dependabot bumps). ## Visible behavior changes for main - **Dependabot** now targets main for nuget, github-actions, AND docker (docker is new) with dual-target shape across main + develop. - **GitHub App token** (\`CODEGEN_APP_CLIENT_ID\` + \`CODEGEN_APP_PRIVATE_KEY\`) on \`actions/create-github-app-token@v3.2.0\` replaces the \`WORKFLOW_PAT\` close/reopen workaround. App-token pushes fire downstream \`pull_request\` events natively. - **Three-job merge-bot** with maintainer-push safeguard (auto-disables auto-merge on a bot PR when a maintainer commits to the branch). - **Method dispatch** by base ref: \`--squash\` on develop, \`--merge\` on main. Enforced upstream by the new per-branch rulesets. ## Last manual sync of its kind Going forward, the dual-target bots open parallel PRs against both branches, so main no longer accumulates content develop is missing. The branch-protection setup explicitly forbids main → develop back-merges (develop's squash-only + linear ruleset blocks merge commits on develop). ## Test plan - [ ] Once merged, post-merge push to main fires \`publish-release.yml\` automatically (validates App-token recursion-guard fix on main). - [ ] Next daily Dependabot cycle: parallel main + develop PRs per ecosystem group (nuget-deps, actions-deps, docker-deps). - [ ] Next weekly codegen run: parallel \`codegen-main\` → main and \`codegen-develop\` → develop PRs, each auto-merging with the correct method.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
This PR updates the codegen files.