diff --git a/.github/workflows/automerge_to_main.yml b/.github/workflows/automerge_to_main.yml index ec295ff..4e55883 100644 --- a/.github/workflows/automerge_to_main.yml +++ b/.github/workflows/automerge_to_main.yml @@ -12,7 +12,7 @@ jobs: uses: swiftlang/github-workflows/.github/workflows/create_automerge_pr.yml@0.0.15 with: base_branch: main - head_branch: release/1.8.x + head_branch: release/1.9.x pr_message: This PR was automatically opened by a GitHub action. Review the changes included in this PR and determine if they should be included on main. If yes, merge the PR. Otherwise revert changes that should not be included on this branch. permissions: contents: write diff --git a/.github/workflows/automerge_to_release.yml b/.github/workflows/automerge_to_release.yml new file mode 100644 index 0000000..006fa36 --- /dev/null +++ b/.github/workflows/automerge_to_release.yml @@ -0,0 +1,21 @@ +name: Create PR to merge the previous release branch into the current release branch +# Changes should land on the earliest release branch they will need to ship on and then be automatically forwarded to later release branches and main +permissions: + contents: read +on: + schedule: + # An hour before automerge_to_main.yml. Runs at the same time would collide due to branch naming. + - cron: '0 8 * * *' + workflow_dispatch: +jobs: + create_merge_pr: + name: Create PR to merge previous release branch into current release branch + uses: swiftlang/github-workflows/.github/workflows/create_automerge_pr.yml@0.0.17 + with: + base_branch: release/1.9.x + head_branch: release/1.8.x + pr_message: This PR was automatically opened by a GitHub action. Review the changes included in this PR and determine if they should be included on this release branch. If yes, merge the PR. Otherwise revert changes that should not be included on this branch. + permissions: + contents: write + pull-requests: write + if: (github.event_name == 'schedule' && github.repository == 'apple/swift-system') || (github.event_name != 'schedule') # Ensure that we don't run this on a schedule in a fork diff --git a/README.md b/README.md index c4c2ad3..49441e2 100644 --- a/README.md +++ b/README.md @@ -114,13 +114,13 @@ We maintain separate branches for each active minor version of the package: | swift-system 1.6.x | release/1.6.0 | | swift-system 1.7.x | release/1.7.0 | | swift-system 1.8.x | release/1.8.x | -| swift-system 1.9.x (unreleased) | | +| swift-system 1.9.x (unreleased) | release/1.9.x | Changes must land on the branch corresponding to the earliest release that they will need to ship on. They are periodically propagated to subsequent branches, in the following direction: -`release/1.7.0` → `release/1.8.x` → `main` +`release/1.8.x` → `release/1.9.x` → `main` -For example, anything landing on `release/1.7.0` will eventually appear on `release/1.8.x` and finally `main` as well. There is no need to file standalone PRs for each release line. (Merges into `main` are performed by the [automerger](.github/workflows/automerge_to_main.yml); propagation between release branches is performed by project maintainers.) +For example, anything landing on `release/1.8.x` will eventually appear on `release/1.9.x` and finally `main` as well. There is no need to file standalone PRs for each release line. (Merges into `release/1.9.x` and `main` are performed by the [release](.github/workflows/automerge_to_release.yml) and [main](.github/workflows/automerge_to_main.yml) automergers; propagation from older release branches is performed by project maintainers.) ### Code of Conduct