Skip to content

Commit 1cb4c72

Browse files
committed
Further fix trigger-release
Signed-off-by: Jonathan Leitschuh <Jonathan.Leitschuh@gmail.com>
1 parent 5448754 commit 1cb4c72

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

.github/workflows/trigger-release.yaml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name: "Trigger Release"
22
on:
33
workflow_dispatch:
44
inputs:
5-
new_version:
6-
description: "Release Version (no 'v'). End with `-rc.#` for release candidate"
7-
required: true
8-
type: string
5+
new_version:
6+
description: "Release Version (no 'v'). End with `-rc.#` for release candidate"
7+
required: true
8+
type: string
99

1010
jobs:
1111
perform-release:
@@ -44,10 +44,16 @@ jobs:
4444
CHANGELOG.md
4545
README.md
4646
47-
- name: Perform Release Tagging and Push
48-
if: (contains(github.ref, '-rc.'))
47+
- name: Cleanup Changed Files for RC
48+
if: contains(github.event.inputs.new_version, '-rc.')
49+
run: |
50+
# Reset the README.md and CHANGELOG.md files to their original state
51+
git checkout HEAD -- README.md CHANGELOG.md
52+
53+
- name: Perform Tagging and Push
4954
# This will trigger the new release job that will take the tag and push the release to the plugin portal
5055
uses: stefanzweifel/git-auto-commit-action@b863ae1933cb653a53c021fe36dbb774e1fb9403 # v5.2.0
5156
with:
5257
commit_message: Release version ${{ github.event.inputs.new_version }}
5358
tagging_message: 'v${{ github.event.inputs.new_version }}'
59+
skip_dirty_check: ${{contains(github.event.inputs.new_version, '-rc.')}}

0 commit comments

Comments
 (0)