Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
cca3f2e
[CRQ-38890] - SCA Updates.
Jul 12, 2024
10a56c2
[CRQ-38890] - SCA Updates.
Jul 12, 2024
fe60bce
Revert "[CRQ-38890] - SCA Updates."
Jul 12, 2024
e0da853
Merge pull request #399 from RWS/hotfix/2.9/CRQ-38890
ben-gineer Jul 12, 2024
10f8021
[maven-release-plugin] prepare release release/2.9/2.9.16
Jul 12, 2024
562d5df
[maven-release-plugin] prepare for next development iteration
Jul 12, 2024
281ca27
UDP-11494 : Added automerge
Feb 5, 2026
309f3ed
Merge pull request #421 from RWS/hotfix/29/UDP-11494
ben-gineer Feb 5, 2026
634d970
UDP-11513 : Added automerge
Mar 20, 2026
7cf6e63
UDP-11513 : Added automerge
Mar 20, 2026
f3e5a90
Merge pull request #425 from RWS/hotfix/29/UDP11513
ben-gineer Mar 20, 2026
cfce732
Merge branch 'release/2.9' into hotfix/210/UDP-11513
Mar 20, 2026
0de22fc
Merge pull request #428 from RWS/hotfix/210/UDP-11513
ben-gineer Mar 20, 2026
337835a
Merge branch 'release/2.10' into hotfix/211/UDP-11513
Mar 20, 2026
e71bf38
UDP-11513 : Fixed actions
Mar 20, 2026
5732db7
Merge pull request #431 from RWS/hotfix/211/UDP-11513
ben-gineer Mar 20, 2026
971a504
Merge branch 'release/2.11' into hotfix/212/UDP-11513
Mar 20, 2026
de1336d
Merge pull request #434 from RWS/hotfix/212/UDP-11513
ben-gineer Mar 20, 2026
16eb5f8
Merge branch 'release/2.12' into hotfix/213/UDP-11513
Mar 20, 2026
0ba4423
UDP-11513 : Fixed actions
Mar 20, 2026
95ae609
Merge pull request #437 from RWS/hotfix/213/UDP-11513
ben-gineer Mar 20, 2026
fe1efdb
Merge branch 'release/2.13' into hotfix/214/UDP-11513
Mar 20, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Automatic Branch Merging

on:
pull_request:
types:
- closed

permissions:
contents: write
pull-requests: write
issues: write

jobs:
merge:
name: Cascading Auto Merge
runs-on: ubuntu-latest

if: |
github.event.pull_request.merged == true &&
startsWith(github.base_ref, 'release/')

steps:
- name: Automatic Merge
uses: ActionsDesk/cascading-downstream-merge@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
prefixes: release/
ref_branch: develop
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ name: Build

on:
push:
branches: [ develop ]
branches: [ release/2.14 ]
pull_request:
branches: [ develop ]
branches: [ release/2.14 ]

jobs:
build:
Expand Down
Loading