ci: rework release workflow making dev the default branch #9514
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
benelan
requested review from
jcfranco,
driskull,
geospatialem and
a team
as code owners
github-actions
bot
added
the
chore
benelan
added
the
skip visual snapshots
alisonailea
approved these changes
Jun 5, 2024
jcfranco
approved these changes
Jun 6, 2024
There was a problem hiding this comment.
Awesome!
I second @alisonailea's comment. Can you add a note about that to releasing.md?
…orkflow * origin/main: (26 commits) revert: refactor: add simpler `componentFocusable` util (deprecates `LoadableComponent`) (#9515) chore(linting): enable selector-pseudo-element-colon-notation rule (#9518) refactor(storybook): refactor tooltip simple story interface (#9538) refactor(dom): consolidate transition/animation waiting utils (#9341) refactor(storybook): build storybook simple story args interfaces using component class (#9457) chore: release next fix(block): add accessible label for slotted controls (#9502) feat(action-bar, action-pad): add expandLabel and collapseLabel to messages (#9497) chore: release next feat(action-menu, combobox, dropdown, input-date-picker, popover): allow logical placements for flipPlacements property. #8825 (#9490) fix(popover): correct border radius on close button (#9485) fix(list-item): hide nested list items by default (#9474) refactor: move component types into component specific interfaces files (#9527) chore: release next fix(alert): pause auto-close alert when link focused (#9503) refactor(storybook): consolidate storybook and component types (#9500) refactor(calcite-block-section,calcite-card): consolidate interfaces imports (#9517) chore: release next fix(block-section): restore block toggling when clicking on the header switch (#9472) chore: release next ...
benelan
added a commit
that referenced
this pull request
Jun 10, 2024
* origin/dev: build(deps): update dependency markdownlint-cli to v0.41.0 (#9531) chore: add translations (#9461) build(deps): update dependency @whitespace/storybook-addon-html to v6.1.1 (#9510) build(deps): update dependency chromatic to v11.5.3 (#9519) build(deps): update dependency jsdom to v24.1.0 (#9530) build(deps): update dependency semver to v7.6.2 (#9508) build(deps): update dependency dayjs to v1.11.11 (#9452) build: update browserslist db (#9528) build(deps): update dependency @cspell/eslint-plugin to v8.8.4 (#9509) build(deps): update dependency quicktype-core to v23.0.170 (#9507) fix(combobox): open the component when typing within it (#9543) feat(split-button): add placement and flipPlacements property (#9548) ci(prerelease): use absolute path to publish script (#9546) ci: rework release workflow making dev the default branch (#9514)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related Issue: #9469 will be closed in favor of this PR
Summary
Make CI changes for a new release workflow that supports hotfixes as patch bumps without causing friction with the versioning and changelog generation setup.
devbranch instead ofmaindev, open a PR targetingmain, and use the rebase merge method when installing.main(where they currently are for all previous releases) and deploys to NPM.devcontaining the cherry-picked the release commit (changelog and package.json version modifications) frommain.dev, wherenextreleases are deployed from.devtomainas needed.mainand cherry-pick the release commit back todevNotes
devandmainwill be our release branch, since that's where all of the tags already exist.devtomaindue to our changelog generation and versioning setup:mainenable rebase-merge method in the repo settings
switch the method to rebase-merge in the PR when installing changes from
devtomaindisable rebase-merge in the repo settings