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

Release Tooling: Force push major/minor releases to main and next-release #27182

Merged
merged 1 commit into from
May 19, 2024

Conversation

JReinhold
Copy link
Contributor

@JReinhold JReinhold commented May 17, 2024

What I did

This PR changes the release workflow for major/minor releases.

The old flow was:

  1. When promoting a beta to stable:
  2. Make the prepared release branch target latest-release instead of next-release
  3. When merged, publish as usual
  4. Merge latest-release into main

(changes never comes back to next)

In this new simplified version:

  1. When promoting a beta to stable:
  2. Make the prepared release branch target next-release like any other release from next
  3. Merge back to next like any other release from next
  4. Force push next to main and latest-release, so they also have the new major/minor

This ensures that all branches are automatically up to date and not commits are lost in the void.

Checklist for Contributors

Testing

We'll do it live

The changes in this PR are covered in the following automated tests:

  • stories
  • unit tests
  • integration tests
  • end-to-end tests

Manual testing

D

Documentation

  • Add or update documentation reflecting your changes
  • If you are deprecating/removing a feature, make sure to update
    MIGRATION.MD

Checklist for Maintainers

  • When this PR is ready for testing, make sure to add ci:normal, ci:merged or ci:daily GH label to it to run a specific set of sandboxes. The particular set of sandboxes can be found in code/lib/cli/src/sandbox-templates.ts

  • Make sure this PR contains one of the labels below:

    Available labels
    • bug: Internal changes that fixes incorrect behavior.
    • maintenance: User-facing maintenance tasks.
    • dependencies: Upgrading (sometimes downgrading) dependencies.
    • build: Internal-facing build tooling & test updates. Will not show up in release changelog.
    • cleanup: Minor cleanup style change. Will not show up in release changelog.
    • documentation: Documentation only changes. Will not show up in release changelog.
    • feature request: Introducing a new feature.
    • BREAKING CHANGE: Changes that break compatibility in some way with current major version.
    • other: Changes that don't fit in the above categories.

🦋 Canary release

This PR does not have a canary release associated. You can request a canary release of this pull request by mentioning the @storybookjs/core team here.

core team members can create a canary release here or locally with gh workflow run --repo storybookjs/storybook canary-release-pr.yml --field pr=<PR_NUMBER>

@JReinhold JReinhold changed the title release majors/minors from next-release and force push to main+latest-release Release Tooling: Force push major/minor releases to main and next-release May 17, 2024
@JReinhold JReinhold self-assigned this May 17, 2024
Copy link

nx-cloud bot commented May 17, 2024

☁️ Nx Cloud Report

CI is running/has finished running commands for commit 72eadaa. As they complete they will appear below. Click to see the status, the terminal output, and the build insights.

📂 See all runs for this CI Pipeline Execution


✅ Successfully ran 1 target

Sent with 💌 from NxCloud.

@JReinhold JReinhold added patch:yes Bugfix & documentation PR that need to be picked to main branch build Internal-facing build tooling & test updates ci:docs Run the CI jobs for documentation checks only. labels May 17, 2024
@JReinhold JReinhold marked this pull request as ready for review May 17, 2024 12:27
@JReinhold JReinhold requested a review from shilman May 17, 2024 12:27
@@ -162,14 +145,13 @@ jobs:
gh pr edit \
--repo "${{github.repository }}" \
--title "Release: $CAPITALIZED_RELEASE_TYPE ${{ inputs.pre-id && format('{0} ', inputs.pre-id) }}${{ steps.bump-version.outputs.next-version }}" \
--base ${{ steps.is-prerelease.outputs.prerelease == 'true' && 'next-release' || 'latest-release' }} \
Copy link
Contributor Author

Choose a reason for hiding this comment

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

when editing an existing release PR, we don't need to update the base branch anymore

@shilman shilman merged commit a5c7f7f into next May 19, 2024
30 of 36 checks passed
@shilman shilman deleted the jeppe/simplify-minor-releases branch May 19, 2024 23:59
storybook-bot pushed a commit that referenced this pull request May 20, 2024
Release Tooling: Force push major/minor releases to `main` and `next-release`

(cherry picked from commit a5c7f7f)
@github-actions github-actions bot mentioned this pull request May 20, 2024
8 tasks
storybook-bot pushed a commit that referenced this pull request May 21, 2024
Release Tooling: Force push major/minor releases to `main` and `next-release`

(cherry picked from commit a5c7f7f)
@github-actions github-actions bot mentioned this pull request May 21, 2024
25 tasks
storybook-bot pushed a commit that referenced this pull request May 21, 2024
Release Tooling: Force push major/minor releases to `main` and `next-release`

(cherry picked from commit a5c7f7f)
storybook-bot pushed a commit that referenced this pull request May 21, 2024
Release Tooling: Force push major/minor releases to `main` and `next-release`

(cherry picked from commit a5c7f7f)
@github-actions github-actions bot added the patch:done Patch/release PRs already cherry-picked to main/release branch label May 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Internal-facing build tooling & test updates ci:docs Run the CI jobs for documentation checks only. patch:done Patch/release PRs already cherry-picked to main/release branch patch:yes Bugfix & documentation PR that need to be picked to main branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants