From 592990f1d314b6dcad308fad27a07756bc66932a Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Fri, 18 Aug 2023 23:34:37 -0700 Subject: [PATCH] make deploy to github action work for non-releases --- .github/workflows/github-release.yml | 8 +++++--- .github/workflows/steam-deploy.yml | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml index 2d8e55335..15791d699 100644 --- a/.github/workflows/github-release.yml +++ b/.github/workflows/github-release.yml @@ -3,7 +3,7 @@ name: Deploy to GitHub on: push: tags: - - '*-r[0-9]+' + - '*-r*' workflow_dispatch: inputs: @@ -39,10 +39,12 @@ jobs: - name: Generate release text run: | python docs/gen_changelog.py -a + CHANGELOG_FILE=docs/changelogs/${{ steps.gettag.outputs.name }}-github.txt + if ! test -f $CHANGELOG_FILE; then CHANGELOG_FILE=docs/changelogs/future-github.txt; fi TOKEN_LINE=$(grep -Fhne '%RELEASE_NOTES%' .github/release_template.md | sed 's/:.*//') head -n $((TOKEN_LINE - 1)) .github/release_template.md > release_body.md - CHANGELOG_LINES=$(wc -l > release_body.md + CHANGELOG_LINES=$(wc -l <$CHANGELOG_FILE) + tail -n $((CHANGELOG_LINES - 3)) $CHANGELOG_FILE >> release_body.md tail -n 2 .github/release_template.md >> release_body.md cat release_body.md - name: Stage release diff --git a/.github/workflows/steam-deploy.yml b/.github/workflows/steam-deploy.yml index 2df81d45d..20160e52f 100644 --- a/.github/workflows/steam-deploy.yml +++ b/.github/workflows/steam-deploy.yml @@ -3,7 +3,7 @@ name: Deploy to Steam on: push: tags: - - '*' + - '*-r*' workflow_dispatch: inputs: