Skip to content

Commit

Permalink
Update release.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
HardNorth committed Jan 22, 2025
1 parent 3ad017d commit 22cb23e
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@ on:
agent:
description: 'Agent to release'
required: true
paths-ignore:
- README.md
- README_TEMPLATE.md
- gradle.properties
- CHANGELOG.md

env:
VERSION_FILE: gradle.properties
Expand Down Expand Up @@ -107,15 +102,13 @@ jobs:
body: ${{ steps.readChangelogEntry.outputs.changes }}

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

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

0 comments on commit 22cb23e

Please sign in to comment.