Skip to content

Commit

Permalink
Update release workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
HardNorth committed Nov 21, 2024
1 parent db83749 commit 13df179
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ on:
push:
branches:
- master
- v4-hotfix
paths-ignore:
- README.md
- README_TEMPLATE.md
- gradle.properties
- CHANGELOG.md

workflow_dispatch:

env:
VERSION_FILE: gradle.properties
VERSION_EXTRACT_PATTERN: '(?<=version=).+'
Expand All @@ -40,6 +40,9 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
ref: 'master'
fetch-depth: 0

- name: Set up JDK 1.8
uses: actions/setup-java@v4
Expand Down Expand Up @@ -106,15 +109,13 @@ jobs:
body: ${{ steps.readChangelogEntry.outputs.changes }}

- name: Checkout develop branch
if: ${{ github.ref }} == 'master'
uses: actions/checkout@v4
with:
ref: 'develop'
fetch-depth: 0

- name: Merge release branch into develop
id: mergeIntoDevelop
if: ${{ github.ref }} == 'master'
run: |
git merge -m 'Merge master branch into develop after a release' origin/master
git status | (! grep -Fq 'both modified:') || git status | grep -F 'both modified:' \
Expand Down

0 comments on commit 13df179

Please sign in to comment.