ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-20 05:28:21 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ES-1313: Merging forward updates from release/os/4.6 to release/os/4.7

Browse Source 
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
This commit is contained in:
Waldemar Zurowski 2023-09-07 14:06:10 +01:00
commit 1c903b0ff2
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
.ci/dev/forward-merge/Jenkinsfile vendored
View File

@ -1,8 +1,31 @@
@Library('corda-shared-build-pipeline-steps@5.1') _ @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.7'
/**
* 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.8'
/**
* Forward merge any changes between #originBranch and #targetBranch
*/
forwardMerger( forwardMerger(
targetBranch: 'release/os/4.8', targetBranch: targetBranch,
originBranch: 'release/os/4.7', originBranch: originBranch,
slackChannel: '#c4-forward-merge-bot-notifications', slackChannel: '#c4-forward-merge-bot-notifications',
) )