Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: "CodeQL"

on:
push:
branches: [ "main", "5.x" ]
branches: [ "main", "v7.1.x" ]
pull_request:
branches: [ "main", "5.x" ]
branches: [ "main", "v7.1.x" ]

jobs:
analyze:
Expand Down
2 changes: 1 addition & 1 deletion etc/notes/releasing.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ release-please automatically tags release commits with a tag in the format v<maj

Then, backport the release action to the target release branch. This should be done as the first PR on the release branch. Use the following instructions to create it.

First, create a copy of our current release action (release.yml). Then, change any references to `main` to the target branch. Double check that there isn't any release tooling on `main` that doesn't exist on the target branch. If there is, make sure this is backported too. After opening the PR, check the CI to make sure everything works as expected: add backports of CI fixes as needed.
First, create a copy of our current release action (release.yml). Then, change any references to `main` to the target branch. Also, add the branch to the list of CodeQL target branches (codeql.yml). Double check that there isn't any release tooling on `main` that doesn't exist on the target branch. If there is, make sure this is backported too. After opening the PR, check the CI to make sure everything works as expected: add backports of CI fixes as needed.

Once the release action PR is merged, release-please will work on this branch in the same way as it does on `main`. Any PRs that merge to the release branch trigger the release action and update the release PR that release-please manages. Proceed as normal from here.

Expand Down
Loading