From 23ad9270d6e2cc41554a8c16cb90ec3f521c68f0 Mon Sep 17 00:00:00 2001 From: Ronan Browne Date: Fri, 10 Nov 2023 18:22:25 +0000 Subject: [PATCH] ES-1608: 5.2 release Branch set up --- .ci/JenkinsfileMergeAutomation | 31 +++++++++++++++++++++ .ci/JenkinsfileSnykDelta | 2 +- .ci/nightly/JenkinsfileNightly | 2 +- .ci/nightly/JenkinsfileSnykScan | 2 +- .ci/nightly/JenkinsfileWindowsCompatibility | 2 +- .github/CODEOWNERS | 8 +++++- Jenkinsfile | 2 +- gradle.properties | 2 +- 8 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 .ci/JenkinsfileMergeAutomation diff --git a/.ci/JenkinsfileMergeAutomation b/.ci/JenkinsfileMergeAutomation new file mode 100644 index 0000000..7917b94 --- /dev/null +++ b/.ci/JenkinsfileMergeAutomation @@ -0,0 +1,31 @@ +#! groovy +@Library('corda-shared-build-pipeline-steps@5.2') _ + +/** + * 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/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/5.2' + +/** + * Forward merge any changes between {@code originBranch} and {@code targetBranch} + */ +forwardMerger( + targetBranch: targetBranch, + originBranch: originBranch, + slackChannel: '#c5-forward-merge-bot-notifications') \ No newline at end of file diff --git a/.ci/JenkinsfileSnykDelta b/.ci/JenkinsfileSnykDelta index b253603..1b7ea91 100644 --- a/.ci/JenkinsfileSnykDelta +++ b/.ci/JenkinsfileSnykDelta @@ -1,4 +1,4 @@ -@Library('corda-shared-build-pipeline-steps@5.1') _ +@Library('corda-shared-build-pipeline-steps@5.2') _ snykDelta( snykOrgId: 'corda5-snyk-org-id', diff --git a/.ci/nightly/JenkinsfileNightly b/.ci/nightly/JenkinsfileNightly index f5e0c20..67c8459 100644 --- a/.ci/nightly/JenkinsfileNightly +++ b/.ci/nightly/JenkinsfileNightly @@ -1,4 +1,4 @@ -@Library('corda-shared-build-pipeline-steps@5.1') _ +@Library('corda-shared-build-pipeline-steps@5.2') _ cordaPipelineKubernetesAgent( runIntegrationTests: false, diff --git a/.ci/nightly/JenkinsfileSnykScan b/.ci/nightly/JenkinsfileSnykScan index 538f5c6..3a2f341 100644 --- a/.ci/nightly/JenkinsfileSnykScan +++ b/.ci/nightly/JenkinsfileSnykScan @@ -1,4 +1,4 @@ -@Library('corda-shared-build-pipeline-steps@5.1') _ +@Library('corda-shared-build-pipeline-steps@5.2') _ cordaSnykScanPipeline ( snykTokenId: 'r3-snyk-corda5', diff --git a/.ci/nightly/JenkinsfileWindowsCompatibility b/.ci/nightly/JenkinsfileWindowsCompatibility index 876a148..02ba13a 100644 --- a/.ci/nightly/JenkinsfileWindowsCompatibility +++ b/.ci/nightly/JenkinsfileWindowsCompatibility @@ -1,4 +1,4 @@ -@Library('corda-shared-build-pipeline-steps@5.1') _ +@Library('corda-shared-build-pipeline-steps@5.2') _ windowsCompatibility( runIntegrationTests: false, diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 7342040..0544220 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1,7 @@ -* @driessamyn @jasonbyrner3 @dimosr @ronanbrowne @rick-r3 @simon-johnson-r3 @blsemo @Omar-awad @aditisdesai @vinir3 @vkolomeyko @thiagoviana @Sakpal +* @corda/rest +# Build scripts should be audited by BLT +*.gradle @corda/blt +gradle.properties @corda/corda5-team-leads +Jenkinsfile @corda/blt +.ci/* @corda/blt +gradle/* @corda/blt \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 8e108cd..dda0c5b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -@Library('corda-shared-build-pipeline-steps@5.1') _ +@Library('corda-shared-build-pipeline-steps@5.2') _ cordaPipelineKubernetesAgent( runIntegrationTests: false, diff --git a/gradle.properties b/gradle.properties index b6ad8c9..c5a162a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ kotlin.stdlib.default.dependency=false # The version of cli-host we will publish -cliHostVersion=5.1.0 +cliHostVersion=5.2.0 # PF4J pf4jVersion=3.10.0