Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restore the "merge to develop" step to the extension release checklist #73

Merged
merged 1 commit into from
Aug 8, 2023

Conversation

tomalec
Copy link
Member

@tomalec tomalec commented Aug 7, 2023

This PR reverts #69

Changes proposed in this Pull Request:

Add merge-trunk-develop-pr action to create a PR to merge trunk to develop after a release done by woocommerce/grow/prepare-extension-release. As automerging with automerge-released-trunk may not work with branch protections.

Screenshots:

Detailed test instructions:

  1. Review the steps in

Or more detailed:

  1. Create a test repo that has the woocommerce/grow/prepare-extension-release set up, but with the prereleased version actions-v1.9.1-pre
  2. Trigger that workflow
  3. Check the checklist, like https://github.com/tomalec/grow/pull/48

Additional details:

  • Probably after merging this PR, we could tweak the PR checklist to mention using merging the PR created by this action, if applicable

Changelog entry

Restore the "merge to develop" step to the extension release checklist

…list

as branch-protected-repos will still need this manual step
@tomalec tomalec requested a review from a team August 7, 2023 16:47
@tomalec tomalec self-assigned this Aug 7, 2023
@tomalec tomalec marked this pull request as ready for review August 7, 2023 17:25
Copy link
Member

@eason9487 eason9487 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@tomalec tomalec merged commit bb60ad6 into trunk Aug 8, 2023
4 checks passed
@tomalec tomalec deleted the tweak/merge-to-trunk-step branch August 8, 2023 09:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants