Update workflows

jwrober · Apr 5, 2024 · 4bcd30d · 4bcd30d
1 parent e36347c
commit 4bcd30d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -76,7 +76,7 @@ jobs:
         run: |
           cmake --build build --target package
       - name: Upload package
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         if: |
           startsWith(github.ref, 'refs/tags/')
             && matrix.compiler == 'gcc'
@@ -170,7 +170,7 @@ jobs:
         run: |
           cmake --build build --target package
       - name: Upload package
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
           files: |
@@ -283,7 +283,7 @@ jobs:
             "staging/"
           shasum -a 256 Freeciv21-${{steps.split.outputs.fragment}}.dmg > Freeciv21-${{steps.split.outputs.fragment}}.dmg.sha256
       - name: Upload package
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
           files: |

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -5,6 +5,11 @@ on:
   schedule:
     - cron: "0 5 * * MON"
   workflow_dispatch: {}
+  workflow_run:
+    workflows: ["Build"]
+    branches: [master, stable]
+    types:
+      - completed
 
 jobs:
   update-autorevision:
@@ -50,6 +55,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - # Make sure there are no unstaged changes
+        # Was reporting changes to eol=crlf files in .gitattributes
+        run: git checkout -- .
       - 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