From af010b169c291e815c79a9a8686b7b3673f0dcd4 Mon Sep 17 00:00:00 2001 From: Ronan Browne Date: Fri, 10 Nov 2023 18:32:11 +0000 Subject: [PATCH] ES-1608: 5.2 release Branch set up --- .ci/JenkinsApiCompatibility | 2 +- .ci/JenkinsfileSnykDelta | 2 +- .../JenkinsForwardMergeReleaseBranch | 30 +++++++++++++++++++ .ci/dev/forward-merge/JenkinsInteropMerge | 2 +- .ci/nightly/JenkinsfileNightly | 2 +- .ci/nightly/JenkinsfileSnykScan | 2 +- .ci/nightly/JenkinsfileWindowsCompatibility | 2 +- .github/CODEOWNERS | 16 +++++++++- Jenkinsfile | 4 +-- gradle.properties | 4 +-- 10 files changed, 55 insertions(+), 11 deletions(-) create mode 100644 .ci/dev/forward-merge/JenkinsForwardMergeReleaseBranch diff --git a/.ci/JenkinsApiCompatibility b/.ci/JenkinsApiCompatibility index 2fb1d7ca2e..a211aa26d4 100644 --- a/.ci/JenkinsApiCompatibility +++ b/.ci/JenkinsApiCompatibility @@ -1,5 +1,5 @@ // Check corda-api compatibility with downstream consumers which implement CordApps -@Library('corda-shared-build-pipeline-steps@5.1') _ +@Library('corda-shared-build-pipeline-steps@5.2') _ cordaApiCompatibilityCheck( javaVersion: '17' diff --git a/.ci/JenkinsfileSnykDelta b/.ci/JenkinsfileSnykDelta index edbcec3751..70f47df328 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/dev/forward-merge/JenkinsForwardMergeReleaseBranch b/.ci/dev/forward-merge/JenkinsForwardMergeReleaseBranch new file mode 100644 index 0000000000..4c0f5d29ec --- /dev/null +++ b/.ci/dev/forward-merge/JenkinsForwardMergeReleaseBranch @@ -0,0 +1,30 @@ +@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/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 #originBranch and #targetBranch + */ +forwardMerger( + targetBranch: targetBranch, + originBranch: originBranch, + slackChannel: '#c5-forward-merge-bot-notifications') \ No newline at end of file diff --git a/.ci/dev/forward-merge/JenkinsInteropMerge b/.ci/dev/forward-merge/JenkinsInteropMerge index 1c238f2d7e..edbf32c9a8 100644 --- a/.ci/dev/forward-merge/JenkinsInteropMerge +++ b/.ci/dev/forward-merge/JenkinsInteropMerge @@ -1,4 +1,4 @@ -@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. diff --git a/.ci/nightly/JenkinsfileNightly b/.ci/nightly/JenkinsfileNightly index a1b6dbf1f9..7ede329d28 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 c654195c7a..20e5e3b0bd 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 ee576237e9..2330061c09 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 734204008d..231ff83a82 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1,15 @@ -* @driessamyn @jasonbyrner3 @dimosr @ronanbrowne @rick-r3 @simon-johnson-r3 @blsemo @Omar-awad @aditisdesai @vinir3 @vkolomeyko @thiagoviana @Sakpal + +# Build scripts and Jenkins files should be audited by BLT +# Any changes to source code of corda-api to be reviewd by C5 team leads + +Jenkinsfile @corda/blt +.ci/** @corda/blt + +gradle/* @corda/blt +*.gradle @corda/blt +gradle.properties @corda/corda5-team-leads + +*.kt @corda/corda5-team-leads +*.java @corda/corda5-team-leads + +CODEOWNERS @corda/blt @corda/corda5-team-leads \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 80b286b560..fc6f809baa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,8 +1,8 @@ -@Library('corda-shared-build-pipeline-steps@5.1') _ +@Library('corda-shared-build-pipeline-steps@5.2') _ cordaPipelineKubernetesAgent( runIntegrationTests: false, - dependentJobsNames: ['/Corda5/corda-runtime-os-version-compatibility/release%2Fos%2F5.1'], + dependentJobsNames: ['/Corda5/corda-runtime-os-version-compatibility/release%2Fos%2F5.2'], dependentJobsNonBlocking: ['/Corda5/corda-api-compatibility/'], // always use -beta-9999999999999 for local publication as this is used for the version compatibility checks, // This is a PR gate, so we want to check the "post merge" state before publication for real. diff --git a/gradle.properties b/gradle.properties index c44844ecd3..e962c3cfe9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,11 +5,11 @@ org.gradle.java.installations.auto-download=false # Versioning -cordaProductVersion = 5.1.0 +cordaProductVersion = 5.2.0 # NOTE: update this each time this module contains a breaking change ## NOTE: currently this is a top level revision, so all API versions will line up, but this could be moved to ## a per module property in which case module versions can change independently. -cordaApiRevision = 37 +cordaApiRevision = 1 # Main kotlinVersion = 1.8.21