robojerk/codeql-action

Clarify merging with merge commit (#1291)

Browse source 
* Clarify merging with merge commit

* Add merge commit message to mergeback PRs
This commit is contained in:
Angela P Wen 2022-10-07 12:05:42 -07:00 • committed by GitHub
parent 3d39294047
commit c6c7d293ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/update-release-branch.py vendored
View file

@ -104,7 +104,7 @@ def open_pr(
body.append(' - [ ] Wait for the "Update dependencies" workflow to push a commit updating the dependencies.')
body.append(' - [ ] Mark the PR as ready for review to trigger the full set of PR checks.')
body.append(' - [ ] Approve and merge this PR.')
body.append(' - [ ] Approve and merge this PR. Make sure `Create a merge commit` is selected rather than `Squash and merge` or `Rebase and merge`.')
if is_v2_release:
body.append(' - [ ] Merge the mergeback PR that will automatically be created once this PR is merged.')

2
.github/workflows/post-release-mergeback.yml vendored
View file

@ -122,7 +122,7 @@ jobs:
- [ ] Remove and re-add the "Update dependencies" label to the PR to trigger just this workflow.
- [ ] Wait for the "Update dependencies" workflow to push a commit updating the dependencies.
- [ ] Mark the PR as ready for review to trigger the full set of PR checks.
- [ ] Approve and merge the PR.
- [ ] Approve and merge the PR. Make sure `Create a merge commit` is selected rather than `Squash and merge` or `Rebase and merge`.
EOF
)