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.

Sign up for GitHub

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

Jump to bottom

Use merge-trunk-develop-pr action #2047

Merged
merged 1 commit into from
Aug 9, 2023
Merged

Use merge-trunk-develop-pr action #2047

merged 1 commit into from
Aug 9, 2023

Conversation

tomalec
Copy link
Member

@tomalec tomalec commented Aug 7, 2023 •
edited
Loading

Changes proposed in this Pull Request:

Use merge-trunk-develop-pr action instead of automerge-released-trunk.
We need a manual PR merge due to our branch protection rules.

Screenshots:

image

image

Detailed test instructions:

  1. Merge this PR 🙈 or fork repo with this branch merged
  2. Create a release PR with woocommerce/grow/prepare-extension-release action
  3. Merge the release PR
  4. Check that a new PR to merge trunk to develop is created

Additional details:

Changelog entry

Dev - Use merge-trunk-develop-pr action

@tomalec
Use merge-trunk-develop-pr action
a8b1aeb 
instead of `automerge-released-trunk`.
We need a manual PR merge due to our branch protection rules.
@tomalec tomalec requested a review from a team August 7, 2023 19:54
@tomalec tomalec self-assigned this Aug 7, 2023
@github-actions github-actions bot added the changelog: dev Developer-facing only change. label Aug 7, 2023
eason9487
eason9487 approved these changes Aug 9, 2023
View reviewed changes
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 e1a0388 into develop Aug 9, 2023
3 checks passed
@tomalec tomalec deleted the dev/release-merge-pr branch August 9, 2023 09:33
@eason9487 eason9487 mentioned this pull request Aug 22, 2023
Merged
17 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eason9487 eason9487 eason9487 approved these changes

Assignees

@tomalec tomalec

Labels
changelog: dev Developer-facing only change.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@tomalec @eason9487