From 466978cb3c459e3bea1f638a7a1b837c0375c694 Mon Sep 17 00:00:00 2001 From: Ronan Browne Date: Mon, 13 Nov 2023 16:47:09 +0000 Subject: [PATCH 1/3] 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' +) + From ca6ff5def8a386ebbcd2ce1db2f240d14baaf5aa Mon Sep 17 00:00:00 2001 From: Ronan Browne Date: Mon, 13 Nov 2023 16:55:32 +0000 Subject: [PATCH 2/3] Update JenkinsfileMergeAutomation --- .ci/dev/forward-merge/JenkinsfileMergeAutomation | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/dev/forward-merge/JenkinsfileMergeAutomation b/.ci/dev/forward-merge/JenkinsfileMergeAutomation index 64309e35e9..a6c5db186f 100644 --- a/.ci/dev/forward-merge/JenkinsfileMergeAutomation +++ b/.ci/dev/forward-merge/JenkinsfileMergeAutomation @@ -14,13 +14,13 @@ * 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' +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.2' +String targetBranch = 'release/os/5.3' /** * Forward merge any changes between {@code originBranch} and {@code targetBranch} From d4d8b19c2dbf195ca8e50153733a48e470489023 Mon Sep 17 00:00:00 2001 From: Ronan Browne Date: Mon, 13 Nov 2023 16:56:02 +0000 Subject: [PATCH 3/3] Update JenkinsfileMergeAutomation --- .ci/dev/forward-merge/JenkinsfileMergeAutomation | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/dev/forward-merge/JenkinsfileMergeAutomation b/.ci/dev/forward-merge/JenkinsfileMergeAutomation index a6c5db186f..f28d503edd 100644 --- a/.ci/dev/forward-merge/JenkinsfileMergeAutomation +++ b/.ci/dev/forward-merge/JenkinsfileMergeAutomation @@ -1,5 +1,5 @@ #! groovy -@Library('corda-shared-build-pipeline-steps@5.1') _ +@Library('corda-shared-build-pipeline-steps@5.2') _ /** * Forward merge any changes in current branch to the branch with following version.