mirror of
https://github.com/corda/corda.git
synced 2024-12-21 22:07:55 +00:00
dfe0ed294e
* add more comments as a form of documentation * move variable names away from calling pipeline for better experience of future forward merges if pipeline parameters were to change
32 lines
927 B
Groovy
32 lines
927 B
Groovy
@Library('corda-shared-build-pipeline-steps@5.1') _
|
|
|
|
/*
|
|
* 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/4.6'
|
|
|
|
/**
|
|
* 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/4.7'
|
|
|
|
/**
|
|
* Forward merge any changes between #originBranch and #targetBranch
|
|
*/
|
|
forwardMerger(
|
|
targetBranch: targetBranch,
|
|
originBranch: originBranch,
|
|
slackChannel: '#c4-forward-merge-bot-notifications',
|
|
)
|