ci: add backmerge branches #2067
Merged
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
# [4.0.0-alpha.16](parse-community/parse-dashboard@4.0.0-alpha.15...4.0.0-alpha.16) (2022-02-10) ### Bug Fixes * adding internal class (e.g. `_User`) fails due to prefixed underscore ([parse-community#2036](parse-community#2036)) ([f80bd07](parse-community@f80bd07))
# [4.0.0-alpha.17](parse-community/parse-dashboard@4.0.0-alpha.16...4.0.0-alpha.17) (2022-02-23) ### Bug Fixes * security upgrade prismjs from 1.26.0 to 1.27.0 ([parse-community#2047](parse-community#2047)) ([3afb24e](parse-community@3afb24e))
Snyk has created this PR to upgrade @babel/runtime from 7.17.0 to 7.17.2. See this package in npm: https://www.npmjs.com/package/@babel/runtime See this project in Snyk: https://app.snyk.io/org/acinader/project/3e039b91-2450-4b56-8420-baf56cab388e?utm_source=github&utm_medium=referral&page=upgrade-pr
# [4.0.0-alpha.18](parse-community/parse-dashboard@4.0.0-alpha.17...4.0.0-alpha.18) (2022-03-02) ### Bug Fixes * upgrade @babel/runtime from 7.17.0 to 7.17.2 ([parse-community#2055](parse-community#2055)) ([93335e9](parse-community@93335e9))
Snyk has created this PR to upgrade express from 4.17.2 to 4.17.3. See this package in npm: https://www.npmjs.com/package/express See this project in Snyk: https://app.snyk.io/org/acinader/project/3e039b91-2450-4b56-8420-baf56cab388e?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: Manuel <5673677+mtrezza@users.noreply.github.com>
# [4.0.0-alpha.19](parse-community/parse-dashboard@4.0.0-alpha.18...4.0.0-alpha.19) (2022-03-10) ### Bug Fixes * upgrade express from 4.17.2 to 4.17.3 ([parse-community#2058](parse-community#2058)) ([f8dc602](parse-community@f8dc602))
# [4.0.0-alpha.20](parse-community/parse-dashboard@4.0.0-alpha.19...4.0.0-alpha.20) (2022-03-16) ### Features * change string filter description ([parse-community#2059](parse-community#2059)) ([bb1e184](parse-community@bb1e184))
Snyk has created this PR to upgrade otpauth from 7.0.10 to 7.0.11. See this package in npm: https://www.npmjs.com/package/otpauth See this project in Snyk: https://app.snyk.io/org/acinader/project/3e039b91-2450-4b56-8420-baf56cab388e?utm_source=github&utm_medium=referral&page=upgrade-pr
# [4.0.0-alpha.21](parse-community/parse-dashboard@4.0.0-alpha.20...4.0.0-alpha.21) (2022-03-18) ### Bug Fixes * upgrade otpauth from 7.0.10 to 7.0.11 ([parse-community#2061](parse-community#2061)) ([c379306](parse-community@c379306))
Thanks for opening this pull request!
|
|
🎉 This change has been released in version 4.1.0-alpha.1 |
|
🎉 This change has been released in version 4.1.0-beta.1 |
beiguancyc
pushed a commit
to beiguancyc/parse-dashboard
that referenced
this pull request
Apr 21, 2022
Merge branch 'release' * release: (32 commits) chore(release): 4.1.0 [skip ci] ci: release commit chore(release): 4.1.0-beta.1 [skip ci] ci: release commit chore(release): 4.1.0-alpha.1 [skip ci] ci: add backmerge branches (parse-community#2067) chore(release): 4.0.0-alpha.21 [skip ci] fix: upgrade otpauth from 7.0.10 to 7.0.11 (parse-community#2061) chore(release): 4.0.0-alpha.20 [skip ci] feat: change string filter description (parse-community#2059) chore(release): 4.0.0-alpha.19 [skip ci] fix: upgrade express from 4.17.2 to 4.17.3 (parse-community#2058) refactor: upgrade body-parser from 1.19.1 to 1.19.2 (parse-community#2057) chore(release): 4.0.0-alpha.18 [skip ci] fix: upgrade @babel/runtime from 7.17.0 to 7.17.2 (parse-community#2055) chore(release): 4.0.0-alpha.17 [skip ci] chore(release): 4.0.0-alpha.16 [skip ci] ci: bump environment chore(release): 4.0.0-beta.4 [skip ci] ci: release commit ... # Conflicts: # package-lock.json
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.
New Pull Request Checklist
Issue Description
The release automation framework "semantic-release" relies on previous tags on the branch from which a release is triggered to determine the next version to be released. It does not recognize tags on other branches, hence after merging a (prerelease) branch into another branch the branch that was merged into the other branch also needs to be rebased onto the branch it was merged into afterwards.
For example: after merging branch
alphaintobetato trigger a beta prerelease, the branchalphaneeds to be rebased on branchbeta. Due to this behavior, auto-release processes of a repo cannot run in parallel, even if they concern different branches.Related issue: #n/a
Approach
Automatically rebase branch after release.
TODOs before merging
n/a