Skip to content

Release tooling: Release stable releases from latest-release #24106

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

Merged
JReinhold merged 32 commits into from
Oct 5, 2023
Merged

Release tooling: Release stable releases from latest-release #24106

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
f5430d3
rename release preparement workflows
JReinhold Aug 28, 2023
8d582d7
merge stable to latest-release instead of next-release, resolving mer…
JReinhold Aug 29, 2023
1161b7a
more renaming of new release workflows
JReinhold Aug 29, 2023
d6297bf
only commit changelog changes when there are actual changes
JReinhold Aug 30, 2023
670bc51
add comments
JReinhold Aug 30, 2023
d5df684
simplify
JReinhold Aug 30, 2023
431ec63
ensure next is always ahead of main during stable releases
JReinhold Aug 31, 2023
5075165
improve readability of publish script
JReinhold Aug 31, 2023
44e988c
pul all release workflows in same concurrency group
JReinhold Aug 31, 2023
bff632d
add todos
JReinhold Sep 1, 2023
8eddd45
Merge branch 'next' of github.com:storybookjs/storybook into release-…
JReinhold Sep 8, 2023
ba8e5fe
cancel any release-preparation runs in progress
JReinhold Sep 8, 2023
a84e270
cleanup
JReinhold Sep 8, 2023
e1a2172
only consider open PRs when looking for frozen state
JReinhold Sep 8, 2023
4d569f2
update tests
JReinhold Sep 8, 2023
00a9089
Merge branch 'next' of github.com:storybookjs/storybook into release-…
JReinhold Sep 24, 2023
4bf6ba4
cleanup
JReinhold Sep 24, 2023
25ebf5c
fix type errors
JReinhold Sep 24, 2023
32ba0d9
Merge branch 'next' of github.com:storybookjs/storybook into release-…
JReinhold Sep 25, 2023
9ca7ed4
cancel when 0 patches to pick
JReinhold Sep 25, 2023
22f12e6
temp rename workflow to test
JReinhold Sep 25, 2023
e719c53
try number when reading pr-count
JReinhold Sep 25, 2023
d757590
compare less than 1
JReinhold Sep 25, 2023
8466a08
check non-null in pr count
JReinhold Sep 25, 2023
d83d422
rename patch workflow
JReinhold Sep 25, 2023
ca7f6f8
hotfix -> patch, next-release -> non-patch-release
JReinhold Oct 4, 2023
15b5933
more renaming
JReinhold Oct 4, 2023
ed18a24
move ensure-next-ahead from a bash script to a tested node script
JReinhold Oct 4, 2023
930adf4
move bash script to cancel preparation runs to tested node script
JReinhold Oct 4, 2023
0b35c18
Merge branch 'next' into release-stable-to-latest
JReinhold Oct 4, 2023
72837ae
fix tests
JReinhold Oct 4, 2023
406e0a5
Merge branch 'release-stable-to-latest' of github.com:storybookjs/sto…
JReinhold Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
cleanup
  • Loading branch information
@JReinhold
JReinhold committed Sep 8, 2023
commit a84e270f67944997ca5870a465088a48187915bb
4 changes: 2 additions & 2 deletions .github/workflows/prepare-hotfix-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ env:
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: 1

concurrency:
group: release-group
cancel-in-progress: false
group: ${{ github.workflow }}
cancel-in-progress: true

jobs:
prepare-hotfix-pull-request:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/prepare-next-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ env:
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: 1

concurrency:
group: release-group
cancel-in-progress: false
group: ${{ github.workflow }}
cancel-in-progress: true

jobs:
prepare-next-pull-request:
Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
git pull origin latest-release
git checkout --ours .
git add .
git commit -m "Merge latest-release into version-1 with conflicts resolved to ours [skip ci]"
git commit -m "Merge latest-release into version-next-from-${{ steps.bump-version.outputs.current-version }} with conflicts resolved to ours [skip ci]"

- name: Generate PR description
id: description
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ permissions:
pull-requests: write

concurrency:
group: release-group
cancel-in-progress: false
group: ${{ github.workflow }}-${{ github.ref_name }}

jobs:
publish:
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING/RELEASING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ To promote a prerelease to a stable reelase, during the [Re-trigger the Workflow
- Release type: Patch, Minor or Major
- Prerelease ID: Leave empty

This scenario is special as it will target `latest-release` instead of `next-release`, and thus merge into `main` when done, and not `next`. So it goes `next` -> `version-from-<CURRENT-VERSION-ON_NEXT` -> `latest-release` -> `main`. When this is done, the Releaser will need to trigger a new release on `next` that bumps the version to a new prerelease minor as described [just below](#first-prerelease-of-new-majorminor---710---720-alpha0-or-800-alpha0).
This scenario is special as it will target `latest-release` instead of `next-release`, and thus merge into `main` when done, and not `next`. So it goes `next` -> `version-from-<CURRENT-VERSION-ON_NEXT` -> `latest-release` -> `main`.

### First prerelease of new major/minor - `7.1.0` -> `7.2.0-alpha.0` or `8.0.0-alpha.0`

Expand Down