Skip to content

Commit 2636ff2

Browse files
committed
Merge branch 'v1/feature/update-release-notes' into v1/contrib
# Conflicts: # docs/RELEASE_INSTRUCTION.md
2 parents 11a59ae + 6b8aa06 commit 2636ff2

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

docs/RELEASE_INSTRUCTION.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,16 @@
77
1. Review the new version numbers and accept with `y` and Lerna will now bump each package and update the local CHANGELOG.md file using descriptions from the conventional commits, Lerna will also reinstall NPM and generate a new lockfile.
88
1. We are continuously improving the way Lerna detects changes, so you may run into packages being bumped and you do not know why. It is okay to publish a package that has not been changed in order not to mess too much with the logic that Lerna uses to detect changes.
99
1. Push all the changes to your release branch.
10+
1. Make a PR from the new branch to the `main` branch.
11+
1. Add the `ignore-for-release`-label to the PR.
1012
1. Wait for GitHub checks to pass.
1113
1. Github will post a comment with a test link to try out that the release works in Storybook. Please check that it works.
1214
1. Merge PR into main **using the rebase strategy** (very important so the history is not mangled) - this will trigger two actions - `Publish`, and `Azure Static Web Apps CI/CD`. The `Publish` workflow is responsible for publishing packages to NPM. It will only publish the packages that have higher version that previously published ones. The azure workflow will build and publish UI library Storybook.
13-
1. Rebase the `main` branch with the `dev` branch by writing `git rebase -i origin/main` and then push the changes.
15+
1. Rebase the `v1/main` branch with the `v1/contrib` branch by writing `git rebase -i origin/main` and then push the changes.
1416
1. Go to Github and [create a new release](https://github.com/umbraco/Umbraco.UI/releases/new).
15-
1. Using tags on the release, we want to target `@umbraco-ui/[email protected]` where "x.x.x" is the version number that the UUI package was bumped to during the release.
16-
1. Copy/paste the release notes generated from before into the release notes field and do a sanity check of the texts - feel free to move stuff around or add additional info.
17+
1. Using tags on the release, we want to target `vx.x.x` where "x.x.x" is the version number that the UUI package was bumped to during the release.
18+
1. Select the prevous version, in relation to your release, in `Previous tag` and press `Generate release notes`.
19+
1. Check the generated release notes, see if PRs are in the right category, if not append labels to them and return to generate again.
1720
1. The UI Library has now been updated.
1821

1922
## How to clear tags

0 commit comments

Comments
 (0)