Skip to content

Commit

Permalink
Merge branch 'release/interop/syntax' into alex/CORE-15730
Browse files Browse the repository at this point in the history
  • Loading branch information
ac101m committed Sep 14, 2023
2 parents e9c6b4d + 3ecb4ab commit 443e712
Showing 1 changed file with 31 additions and 0 deletions.
31 changes: 31 additions & 0 deletions .ci/dev/forward-merge/JenkinsInteropMerge
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
@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/interop/syntax'

/**
* Forward merge any changes between #originBranch and #targetBranch
*/
forwardMerger(
targetBranch: targetBranch,
originBranch: originBranch,
slackChannel: '#interop-forward-merge-bot-notifications',
)

0 comments on commit 443e712

Please sign in to comment.