Skip to content

Commit

Permalink
ES-1608: 5.2 release Branch set up
Browse files Browse the repository at this point in the history
  • Loading branch information
ronanbrowne committed Nov 10, 2023
1 parent e0b5f1f commit 23ad927
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 7 deletions.
31 changes: 31 additions & 0 deletions .ci/JenkinsfileMergeAutomation
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#! groovy
@Library('[email protected]') _

/**
* 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')
2 changes: 1 addition & 1 deletion .ci/JenkinsfileSnykDelta
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
2 changes: 1 addition & 1 deletion .ci/nightly/JenkinsfileNightly
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('corda-shared-build-pipeline-steps@5.1') _
@Library('corda-shared-build-pipeline-steps@5.2') _

cordaPipelineKubernetesAgent(
runIntegrationTests: false,
Expand Down
2 changes: 1 addition & 1 deletion .ci/nightly/JenkinsfileSnykScan
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
2 changes: 1 addition & 1 deletion .ci/nightly/JenkinsfileWindowsCompatibility
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('corda-shared-build-pipeline-steps@5.1') _
@Library('corda-shared-build-pipeline-steps@5.2') _

windowsCompatibility(
runIntegrationTests: false,
Expand Down
8 changes: 7 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('corda-shared-build-pipeline-steps@5.1') _
@Library('corda-shared-build-pipeline-steps@5.2') _

cordaPipelineKubernetesAgent(
runIntegrationTests: false,
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 23ad927

Please sign in to comment.