Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ name: Build

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

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v6
- name: Set up JDK 21
uses: actions/setup-java@v3
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '21'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ on:
releaseBuild:
description: 'Release build (e.g. 8)'
required: true
default: ''
default: '0'

jobs:
release:
name: Release on Sonatype OSS ${{ github.event.inputs.releaseVersion }}.${{ github.event.inputs.releaseBuild }}
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v6

- name: Set up JDK 21
uses: actions/setup-java@v3
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '21'
Expand Down
Loading