-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1336 from corda/merge-release/os/5.1-release/os/5…
….2-2023-11-13-1 ES-1621: Merging forward updates from release/os/5.1 to release/os/5.2 - 2023-11-13
- Loading branch information
Showing
1 changed file
with
33 additions
and
0 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
#! groovy | ||
@Library('[email protected]') _ | ||
|
||
/** | ||
* Forward merge any changes in current branch to the branch with following version. | ||
* | ||
* Please note, the branches names are intentionally separated as variables, to minimised conflicts | ||
* during automated merges for this file. | ||
* | ||
* These variables should be updated when a new version is cut | ||
*/ | ||
|
||
/** | ||
* the branch name of origin branch, it should match the current branch | ||
* and it acts as a fail-safe inside {@code forwardMerger} pipeline | ||
*/ | ||
String originBranch = 'release/os/5.2' | ||
|
||
/** | ||
* the branch name of target branch, it should be the branch with the next version | ||
* after the one in current branch. | ||
*/ | ||
String targetBranch = 'release/os/5.3' | ||
|
||
/** | ||
* Forward merge any changes between {@code originBranch} and {@code targetBranch} | ||
*/ | ||
forwardMerger( | ||
targetBranch: targetBranch, | ||
originBranch: originBranch, | ||
slackChannel: '#c5-forward-merge-bot-notifications' | ||
) | ||
|