Title: Document merge-commit requirement for release PRs by redsun82 · Pull Request #4110 · github/codeql-action · GitHub
Open Graph Title: Document merge-commit requirement for release PRs by redsun82 · Pull Request #4110 · github/codeql-action
X Title: Document merge-commit requirement for release PRs by redsun82 · Pull Request #4110 · github/codeql-action
Description: The release process creates a cascade of PRs (main -> releases/vN, then the releases/vN -> main mergeback, then a releases/vN -> releases/v(N-1) backport). These must be merged with a merge commit: the mergeback tags the release using the merge commit of the "Merge main into releases/vN" PR, so squashing or rebasing breaks tagging and the branch linkage the release automation relies on. Today nothing in the repo states this, so it depends on whoever clicks merge remembering the right strategy. This PR bakes the rule into two places: .github/instructions/release-merge.instructions.md (new) - a path-scoped Copilot instructions file with an applyTo glob targeting the files that reliably change in release/mergeback/backport PRs (CHANGELOG.md, src/defaults.json, lib/defaults.json, src/api-compatibility.json). It tells the agent to merge with a merge commit and arm auto-merge with --merge. CONTRIBUTING.md - the human-facing Releasing runbook. Both automerge steps now say to merge "with a merge commit (gh pr merge --merge)", plus a > [!NOTE] explaining why squash/rebase would break tagging. Docs-only change; no behavior or code paths are affected. Risk assessment Low risk: Documentation only. Which use cases does this change impact? Environments: Testing/None - This change does not impact any CodeQL workflows in production. How did/will you validate this change? None - Documentation-only change; no runtime behavior is affected. If something goes wrong after this change is released, what are the mitigation and rollback strategies? Development/testing only - This change cannot cause any failures in production. How will you know if something goes wrong after this change is released? Other - N/A, documentation-only change. Are there any special considerations for merging or releasing this change? No special considerations - This change can be merged at any time. Merge / deployment checklist Confirm this change is backwards compatible with existing workflows. Consider adding a changelog entry for this change. Confirm the readme and docs have been updated if necessary.
Open Graph Description: The release process creates a cascade of PRs (main -> releases/vN, then the releases/vN -> main mergeback, then a releases/vN -> releases/v(N-1) backport). These must be merged with a merg...
X Description: The release process creates a cascade of PRs (main -> releases/vN, then the releases/vN -> main mergeback, then a releases/vN -> releases/v(N-1) backport). These must be merged...
Opengraph URL: https://github.com/github/codeql-action/pull/4110
X: @github
Domain: github.com
| react-profiling | 0 |
| react-import-map | react,react-dom,react-dom/client,react-dom/profiling,react-is,react-reconciler,react/compiler-runtime,react/jsx-dev-runtime,react/jsx-runtime,scheduler@d5750093facf |
| route-pattern | /:user_id/:repository/pull/:id/files(.:format) |
| route-controller | pull_requests |
| route-action | files |
| fetch-nonce | v2:827e324e-38d1-bf62-7a43-ef016749cc0e |
| current-catalog-service-hash | ae870bc5e265a340912cde392f23dad3671a0a881730ffdadd82f2f57d81641b |
| request-id | CF10:195268:474768:5C3D78:6AED2397 |
| html-safe-nonce | cd8945d250e8a9c34a8b5c635ec647e1df97df96bdc567f094a8e5d9e40a602d |
| visitor-payload | eyJyZWZlcnJlciI6IiIsInJlcXVlc3RfaWQiOiJDRjEwOjE5NTI2ODo0NzQ3Njg6NUMzRDc4OjZBRUQyMzk3IiwidmlzaXRvcl9pZCI6IjE3MzU5MDQ4ODgwOTc2NzgyMzEiLCJyZWdpb25fZWRnZSI6ImlhZCIsInJlZ2lvbl9yZW5kZXIiOiJpYWQifQ== |
| visitor-hmac | 98d8882233963efc84447a09bccef01c8e93545a149a25c91f62adaa00073300 |
| hovercard-subject-tag | pull_request:4368413062 |
| github-keyboard-shortcuts | repository,pull-request-list,pull-request-conversation,pull-request-files-changed,copilot |
| google-site-verification | Apib7-x98H0j5cPqHWwSMm6dNU4GmODRoqxLiDzdx9I |
| octolytics-url | https://collector.github.com/github/collect |
| analytics-location | / |
| fb:app_id | 1401488693436528 |
| apple-itunes-app | app-id=1477376905, app-argument=https://github.com/github/codeql-action/pull/4110/files |
| twitter:image | https://avatars.githubusercontent.com/u/1718270?s=400&v=4 |
| twitter:card | summary_large_image |
| og:image | https://avatars.githubusercontent.com/u/1718270?s=400&v=4 |
| og:image:alt | The release process creates a cascade of PRs (main -> releases/vN, then the releases/vN -> main mergeback, then a releases/vN -> releases/v(N-1) backport). These must be merged with a merg... |
| og:site_name | GitHub |
| og:type | object |
| hostname | github.com |
| expected-hostname | github.com |
| None | e3e0f7f63e50c6fe879198a93a0a023a648ecc0a5e9bc3b5e033ac57172237e6 |
| turbo-cache-control | no-preview |
| diff-view | unified |
| go-import | github.com/github/codeql-action git https://github.com/github/codeql-action.git |
| octolytics-dimension-user_id | 9919 |
| octolytics-dimension-user_login | github |
| octolytics-dimension-repository_id | 259445878 |
| octolytics-dimension-repository_nwo | github/codeql-action |
| octolytics-dimension-repository_public | true |
| octolytics-dimension-repository_is_fork | false |
| octolytics-dimension-repository_network_root_id | 259445878 |
| octolytics-dimension-repository_network_root_nwo | github/codeql-action |
| turbo-body-classes | logged-out env-production page-responsive full-width |
| disable-turbo | true |
| browser-stats-url | https://api.github.com/_private/browser/stats |
| browser-errors-url | https://api.github.com/_private/browser/errors |
| release | 707a24b346ac8a82878b9c084efaa38a997660cb |
| ui-target | full |
| theme-color | #1e2327 |
| color-scheme | light dark |
Links:
Viewport: width=device-width