Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release/os/5.2' into nikinagy/CO…
Browse files Browse the repository at this point in the history
…RE-17355

# Conflicts:
#	.github/CODEOWNERS
#	gradle.properties
  • Loading branch information
nikinagy committed Nov 14, 2023
2 parents a2c2397 + 2325745 commit c4711d4
Show file tree
Hide file tree
Showing 12 changed files with 109 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .ci/JenkinsApiCompatibility
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
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
30 changes: 30 additions & 0 deletions .ci/dev/forward-merge/JenkinsForwardMergeReleaseBranch
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
@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/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')
2 changes: 1 addition & 1 deletion .ci/dev/forward-merge/JenkinsInteropMerge
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') _

/*
* Forward merge any changes in current branch to the branch with following version.
Expand Down
33 changes: 33 additions & 0 deletions .ci/dev/forward-merge/JenkinsfileMergeAutomation
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#! 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/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.3'

/**
* 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/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
17 changes: 16 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,2 +1,17 @@
* @corda/corda-platform-network-team

# 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

**/scans/*.yaml @corda/corda5-team-leads

CODEOWNERS @corda/blt @corda/corda5-team-leads
20 changes: 20 additions & 0 deletions .github/workflows/remove-stale-prs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: 'Close stale issues and PR'
on:
schedule:
- cron: '0 0 * * 1-5'

jobs:
remove-stale-prs:
name: Remove stale PRs
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
with:
debug-only: true
exempt-pr-labels: 'DO_NOT_CLOSE'
stale-pr-message: 'This PR is stale because it has been open 7 days with no activity. Remove the `Stale` label or add a comment - otherwise this will be closed in 7 days.'
close-pr-message: 'This PR was closed because it has been stale for 7 days with no activity.'
days-before-issue-stale: -1
days-before-issue-close: -1
days-before-pr-stale: 7
days-before-pr-close: 7
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 38-NETWORK-5-2
cordaApiRevision = 2

# Main
kotlinVersion = 1.8.21
Expand Down

0 comments on commit c4711d4

Please sign in to comment.