Releases: ActionsDesk/cascading-downstream-merge
v3.1.0
What's Changed
- Bump @rollup/rollup-linux-x64-gnu from 4.34.9 to 4.35.0 by @dependabot[bot] in #58
- Bump the npm-development group with 6 updates by @dependabot[bot] in #57
- Bump @rollup/rollup-linux-x64-gnu from 4.35.0 to 4.36.0 by @dependabot[bot] in #62
- Bump the npm-development group with 3 updates by @dependabot[bot] in #61
- Bump eslint-import-resolver-typescript from 3.8.4 to 4.1.1 by @dependabot[bot] in #60
- Bump @rollup/rollup-linux-x64-gnu from 4.36.0 to 4.37.0 by @dependabot[bot] in #65
- Bump the npm-development group with 9 updates by @dependabot[bot] in #64
- Bump eslint-plugin-github from 5.1.8 to 6.0.0 by @dependabot[bot] in #63
- Bump @rollup/rollup-linux-x64-gnu from 4.37.0 to 4.38.0 by @dependabot[bot] in #67
- Bump the npm-development group with 7 updates by @dependabot[bot] in #66
- Bump @rollup/rollup-linux-x64-gnu from 4.38.0 to 4.40.0 by @dependabot[bot] in #71
- Bump @octokit/request-error from 6.1.7 to 6.1.8 in the npm_and_yarn group by @dependabot[bot] in #73
- Bump the npm-development group across 1 directory with 13 updates by @dependabot[bot] in #75
- Bump @octokit/types from 13.10.0 to 14.0.0 by @dependabot[bot] in #77
- Bump the npm-development group across 1 directory with 8 updates by @dependabot[bot] in #78
- Bump the npm-development group with 7 updates by @dependabot[bot] in #80
- Bump the npm-development group with 6 updates by @dependabot[bot] in #81
- Bump the npm-development group with 5 updates by @dependabot[bot] in #85
- Bump actions/setup-node from 4 to 5 by @dependabot[bot] in #100
- Added support for GHE and *.GHE.com by @lfraile in #96
- Bump actions/checkout from 4 to 5 by @dependabot[bot] in #99
- Bump @actions/github from 6.0.0 to 6.0.1 in the npm-production group across 1 directory by @dependabot[bot] in #90
- Bump super-linter/super-linter from 7 to 8 by @dependabot[bot] in #95
- Bump the npm-development group across 1 directory with 15 updates by @dependabot[bot] in #102
- Bump @octokit/request-error from 6.1.8 to 7.0.0 by @dependabot[bot] in #88
- update the README to show how to use this exactly like BitBickets auto-merge feature by @robandpdx in #94
New Contributors
- @lfraile made their first contribution in #96
- @robandpdx made their first contribution in #94
Full Changelog: v3.0...v3.1.0
v3.0.0
What's Changed
- fix typo in readme by @simo-ltrischberger in #46
- Bump the npm-development group across 1 directory with 8 updates by @dependabot in #48
- Bump @octokit/rest from 21.1.0 to 21.1.1 in the npm-production group across 1 directory by @dependabot in #49
- Bump the npm-development group with 9 updates by @dependabot in #50
- Bump @github/local-action from 2.6.3 to 3.0.0 by @dependabot in #53
- Bump @rollup/rollup-linux-x64-gnu from 4.34.8 to 4.34.9 in the npm-production group by @dependabot in #52
- Bump the npm-development group across 1 directory with 9 updates by @dependabot in #55
- Implement bitbucket branch ordering algorithm by @ncalteen in #56
New Contributors
- @simo-ltrischberger made their first contribution in #46
- @dependabot made their first contribution in #48
Full Changelog: v2...v3.0.0
v2.0.0
v1.2.0 - Actions dependency updates to support Node 20 and branch pagination reduction
v1.1.0 - Update to Merge Strategy
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
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
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
Dual Tokens, UnderScore Fix and Unit Testing
Cascade on close
Merge pull request #2 from ActionsDesk/cascade-on-close Changes to workflow and some logging
distribution
v0.1.2 updated .gitignore
second test
v0.1.1 added npm modules

