Skip to content
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

ci: add backmerge branches #2067

Merged
merged 24 commits into from
Mar 23, 2022
Merged

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

mtrezza and others added 23 commits February 8, 2022 01:03
# [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))
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>
@parse-github-assistant
Copy link

parse-github-assistant bot commented Mar 23, 2022

Thanks for opening this pull request!

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

@mtrezza mtrezza changed the title add backmerge ci: add backmerge branches Mar 23, 2022
@mtrezza mtrezza merged commit 6ece67c into parse-community:alpha Mar 23, 2022
@parseplatformorg
Copy link
Contributor

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

@parseplatformorg parseplatformorg added the state:released-alpha Released as alpha version label Mar 23, 2022
@mtrezza mtrezza deleted the ci-add-backmerge branch March 23, 2022 03:31
@parseplatformorg
Copy link
Contributor

🎉 This change has been released in version 4.1.0-beta.1

@parseplatformorg parseplatformorg added the state:released-beta Released as beta version label Mar 23, 2022
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
Labels
state:released-alpha Released as alpha version state:released-beta Released as beta version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants