From 96ec811cbd29e69027c02a5a78ae8fbf0d7b1dca Mon Sep 17 00:00:00 2001 From: James Date: Mon, 9 Sep 2024 17:40:24 -0500 Subject: [PATCH] Update AutoRev release steps Using tips from the action's author to remove the problem file --- .github/workflows/release.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index aa213ff8f3..c59c62cf4b 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -15,8 +15,6 @@ jobs: - # Make sure there are no unstaged changes # Was reporting changes to eol=crlf files in .gitattributes run: git checkout -- . - - run: git status - - run: git stash - run: git rev-parse --short=5 HEAD > cmake/AutoRevision.txt - run: git describe --tags `git rev-list --tags --max-count=1` >> cmake/AutoRevision.txt - run: cat cmake/AutoRevision.txt @@ -28,8 +26,12 @@ jobs: branch=$(git branch -r --contains HEAD --format '%(refname:strip=3)') echo Target branch is $branch echo branch=$branch >> $GITHUB_OUTPUT + - name: Problem file cleanup + # We have this problematic file that we need to remove + run: | + rm dist/freeciv21-server.cmd - name: Create Pull Request - uses: peter-evans/create-pull-request@v6 + uses: peter-evans/create-pull-request@v7 with: base: ${{ steps.branch.outputs.branch }} commit-message: "Release update of AutoRevision.txt"