Skip to content

Conversation

@jtoar
Copy link
Contributor

@jtoar jtoar commented Sep 18, 2022

This PR adds two new workflows that 1) create PRs against the release branch when a PR is merged to the main branch (as long as the PR isn't breaking) and 2) enables auto-merge on said PRs. I've tested these workflows on my fork of Redwood, but they may still need some work.

We're trying out a new branch strategy so that we can merge breaking changes into main while still releasing minors and patches. I won't go into all the details right now, but this is one of the first things we need.

@jtoar jtoar added the release:chore This PR is a chore (means nothing for users) label Sep 18, 2022
@jtoar jtoar enabled auto-merge (squash) September 18, 2022 07:55
@jtoar jtoar merged commit eb4c3c9 into main Sep 18, 2022
@jtoar jtoar deleted the ds-add-cherry-pick-ci branch September 18, 2022 08:18
@redwoodjs-bot redwoodjs-bot bot added this to the next-release milestone Sep 18, 2022
github-actions bot pushed a commit that referenced this pull request Sep 18, 2022
jtoar added a commit that referenced this pull request Sep 18, 2022
@jtoar jtoar modified the milestones: next-release, v3.1.0 Sep 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

release:chore This PR is a chore (means nothing for users)

Projects

No open projects
Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants