Skip to content

Releases: ActionsDesk/cascading-downstream-merge

v1.2.0 - Actions dependency updates to support Node 20 and branch pagination reduction

14 Dec 22:04
d2e5c5a
Compare
Choose a tag to compare

What's Changed

New Contributors

Full Changelog: v1.1.0...v1.2.0

v1.1.0 - Update to Merge Strategy

22 Jun 17:26
a8e0331
Compare
Choose a tag to compare

What's Changed

This release updates the cascade flow to match more closely to what BitBucket does today. Before this release, the flow would attempt to cascade to upstream release branches, and then merge the feature branch directly into the refBranch.

Also, this release adds pagination to the branch query adding support for repos with more than 100 branches.

Example Git Graph of Old Flow

Screen Shot 2022-06-17 at 11 22 13 AM

This pull request now makes the final merge into the refBranch as part of the cascade. This is what the BitBucket auto-merge plugin does today. If there is an issue within the cascade, a fix is needed to continue on to eventually finish at the default branch.

Example Git Graph of New Flow

Screen Shot 2022-06-21 at 3 16 12 PM

Considerations

The advantage to this new flow is also that feature branches can be deleted once merged and it won't effect the workflow. The down side is if teams turn on auto-delete and the release branch protections are not in place, they will too be deleted. Granted, this has always been the case.

Full Changelog: v1.0.0...v1.1.0

v1.0.0 - Refactor & Improvements

17 Jun 16:39
d114948
Compare
Choose a tag to compare

What's Changed

  • Refactor with better error handling & PR comments by @bakosa in #19
  • add MERGE_TOKEN to inputs of this action to suppress warning by @bakosa in #17
  • Documentation Updates by @jdesulme in #18

Full Changelog: v0.1.4...v1.0.0

Dual Tokens, UnderScore Fix and Unit Testing

15 Jun 14:56
c6dd91d
Compare
Choose a tag to compare

What's Changed

Full Changelog: v0.1.3...v0.1.4

Cascade on close

02 Jun 20:36
22025e3
Compare
Choose a tag to compare
Merge pull request #2 from ActionsDesk/cascade-on-close

Changes to workflow and some logging

distribution

27 May 19:26
Compare
Choose a tag to compare
v0.1.2

updated .gitignore

second test

27 May 18:33
Compare
Choose a tag to compare
v0.1.1

added npm modules

first test

27 May 18:04
4cfbd54
Compare
Choose a tag to compare
v0.1

Create setup-branches.sh