Skip to content

ci: add backmerge #1457

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

Merged
merged 1 commit into from
Mar 23, 2022
Merged

ci: add backmerge #1457

merged 1 commit into from
Mar 23, 2022

Conversation

mtrezza
Copy link
Member

@mtrezza mtrezza commented Mar 23, 2022

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 alpha into beta to trigger a beta prerelease, the branch alpha needs to be rebased on branch beta. 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

@parse-github-assistant
Copy link

Thanks for opening this pull request!

  • 🎉 We are excited about your hands-on contribution!

@mtrezza mtrezza merged commit f14a490 into parse-community:alpha Mar 23, 2022
@mtrezza mtrezza deleted the ci-add-backmerge branch March 23, 2022 19:05
@parseplatformorg
Copy link
Contributor

🎉 This change has been released in version 3.4.2-alpha.1

@parseplatformorg parseplatformorg added the state:released-alpha Released as alpha version label Apr 9, 2022
@parseplatformorg
Copy link
Contributor

🎉 This change has been released in version 3.4.2

@parseplatformorg parseplatformorg added the state:released Released as stable version label May 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
state:released Released as stable version state:released-alpha Released as alpha version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants