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

Tooling: allow alpha release suffix on release branches #40316

Merged
merged 1 commit into from
Nov 25, 2024

Conversation

tbradsha
Copy link
Contributor

Currently when creating a release branch, it removes any suffix starting with a hyphen. This was probably intended to remove the -beta suffix (p1725907150549519/1725905587.302229-slack-C05Q5HSS013) but now that Jetpack no longer creates weekly/* branches, it uses -a.* as the base branch, and the code strips said suffix. This is means each alpha release tries to push to the same branch rather than an alpha-specific branch.

This PR is quite simple: it switches the code to only remove the -beta suffix.

Other information:

  • Have you written new tests for your changes, if applicable?
  • Have you checked the E2E test CI results, and verified that your changes do not break them?
  • Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

Does this pull request change what data or activity we track or use?

Testing instructions:

Verify the following create branches matching the passed version (no need to checkout prerelease):

  • tools/create-release-branch.sh jetpack 14.1
  • tools/create-release-branch.sh jetpack 14.1-a.5
  • tools/create-release-branch.sh jetpack 14.1-beta

@tbradsha tbradsha requested a review from a team November 22, 2024 20:01
@tbradsha tbradsha self-assigned this Nov 22, 2024
Copy link
Contributor

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

  • ✅ Include a description of your PR changes.
  • ✅ Add a "[Status]" label (In Progress, Needs Team Review, ...).
  • ✅ Add testing instructions.
  • ✅ Specify whether this PR includes any changes to data or privacy.
  • ✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖


The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available.


Follow this PR Review Process:

  1. Ensure all required checks appearing at the bottom of this PR are passing.
  2. Choose a review path based on your changes:
    • A. Team Review: add the "[Status] Needs Team Review" label
      • For most changes, including minor cross-team impacts.
      • Example: Updating a team-specific component or a small change to a shared library.
    • B. Crew Review: add the "[Status] Needs Review" label
      • For significant changes to core functionality.
      • Example: Major updates to a shared library or complex features.
    • C. Both: Start with Team, then request Crew
      • For complex changes or when you need extra confidence.
      • Example: Refactor affecting multiple systems.
  3. Get at least one approval before merging.

Still unsure? Reach out in #jetpack-developers for guidance!

@zinigor zinigor merged commit 024ce04 into trunk Nov 25, 2024
57 checks passed
@zinigor zinigor deleted the fix/alpha_release_branches branch November 25, 2024 15:19
@@ -197,7 +197,7 @@ fi
# - Else if the prefix matches a plugin dir name, use that plugin's version.
# - Else ask.
if [[ "${PREFIXES[$PREFIX]}" != *$'\n'* ]]; then
BRANCH="$PREFIX/branch-${VERSIONS[0]%%-*}"
BRANCH="$PREFIX/branch-${VERSIONS[0]%%-beta}"
Copy link
Contributor

Choose a reason for hiding this comment

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

At some point we may want to revisit this to decide if we want to also remove -beta.2 and the like.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants