From 466978cb3c459e3bea1f638a7a1b837c0375c694 Mon Sep 17 00:00:00 2001 From: Ronan Browne Date: Mon, 13 Nov 2023 16:47:09 +0000 Subject: [PATCH] ES-1621: active forward merge automation (#1335) --- .../forward-merge/JenkinsfileMergeAutomation | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .ci/dev/forward-merge/JenkinsfileMergeAutomation diff --git a/.ci/dev/forward-merge/JenkinsfileMergeAutomation b/.ci/dev/forward-merge/JenkinsfileMergeAutomation new file mode 100644 index 0000000000..64309e35e9 --- /dev/null +++ b/.ci/dev/forward-merge/JenkinsfileMergeAutomation @@ -0,0 +1,33 @@ +#! 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/5.1' + +/** + * 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.2' + +/** + * Forward merge any changes between {@code originBranch} and {@code targetBranch} + */ +forwardMerger( + targetBranch: targetBranch, + originBranch: originBranch, + slackChannel: '#c5-forward-merge-bot-notifications' +) +