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

Ensure the cherry pick operation only executes against trunk #47312

Conversation

nigeljamesstevenson
Copy link
Contributor

Submission Review Guidelines:

Changes proposed in this Pull Request:

If a PR is merged with a milestone (or a milestone is added to a PR after it's merged) that targets a branch other than trunk, we shouldn't run the cherry-pick workflow.

Closes #38896

How to test the changes in this Pull Request:

Using the WooCommerce Testing Instructions Guide, include your detailed testing instructions:

  1. Fork this repo and update the workflow file changed in this PR
  2. Create a private slack channel for testing purposes. Call it whatever you want e.g. nigel-test-channel and obtain the Channel ID
  3. Add the secrets required for this PR :
  • secrets.CODE_FREEZE_BOT_TOKEN - use the value for secrets.TEST_ASSISTANCE_BOT_TOKEN instead (ask me if you don't know what it is) - i.e. you can use our test assistance bot for testing purposes
  • secrets.WOO_RELEASE_SLACK_NOTIFICATION_CHANNEL - use the Channel ID from the channel created in step 2 for this (we do not want to send test messages to the actual WOO_RELEASE_SLACK_NOTIFICATION_CHANNEL)
  1. Disable unnecessary workflows in your Fork to save bandwidth (you only need this workflow to be operational)

  2. Create some milestones for testing purposes e.g. 9.1.0, 9.0.0, 8.9.0, 8.8.0

  3. Create and merge a PR in your Fork targeting trunk for testing purposes. If you have one already, you can use it.

  4. This PR will likely be assigned a valid Milestone e.g. 9.0.0 if the appropriate workflow is enabled on your fork.

  5. Attempt to 'cherry pick' the PR created in step 6 into a release branch by assigning it another milestone e.g. 8.9.0

  6. Validate that the cherry pick operation kicks off and attempts to perform the appropriate cherry-picking by progressing to the Prep inputs task
    image

  7. Create and merge a PR in your Fork targeting a release branch (such as release/8.9) for testing purposes. If you have one already, you can use it.

  8. Attempt to 'cherry pick' this PR into a release branch by assigning it another milestone e.g. 8.9.0

  9. Validate that the cherry pick operation does not kick off and does not attempt to perform the appropriate cherry-picking and does not progress to the Prep inputs task
    image

Changelog entry

  • Automatically create a changelog entry from the details below.

Significance

  • Patch
  • Minor
  • Major

Type

  • Fix - Fixes an existing bug
  • Add - Adds functionality
  • Update - Update existing functionality
  • Dev - Development related task
  • Tweak - A minor adjustment to the codebase
  • Performance - Address performance issues
  • Enhancement - Improvement to existing functionality

Message

Comment

nigeljamesstevenson and others added 30 commits April 6, 2024 16:35
Copy link
Contributor

github-actions bot commented May 9, 2024

Hi @rodelgc, @Stojdza, @alvarothomas,

Apart from reviewing the code changes, please make sure to review the testing instructions as well.

You can follow this guide to find out what good testing instructions should look like:
https://github.com/woocommerce/woocommerce/wiki/Writing-high-quality-testing-instructions

Copy link
Contributor

@Stojdza Stojdza left a comment

Choose a reason for hiding this comment

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

It took me some time to set up everything and test it properly, but it all works as described 🚀

Screenshot 2024-05-09 at 18 44 59

@nigeljamesstevenson nigeljamesstevenson merged commit 0cd8740 into woocommerce:trunk May 11, 2024
27 of 29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
focus: release Issues related to releasing WooCommerce. team: Solaris
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Only run cherry-pick workflow on PRs targeting trunk.
2 participants