From 0c8a17a9b7ed96ae7640a355ba3c462d4522271f Mon Sep 17 00:00:00 2001
From: Cong <congusbongus@gmail.com>
Date: Sat, 4 May 2024 10:59:37 +1000
Subject: [PATCH] Deploy on release created, github upload butler #853

---
 .github/workflows/cmake.yml            | 14 +++++++++++---
 .github/workflows/cmake.yml.cmake      | 14 +++++++++++---
 appveyor.yml                           |  2 +-
 appveyor.yml.cmake                     |  2 +-
 build/{appveyor => windows}/butler.bat |  0
 5 files changed, 24 insertions(+), 8 deletions(-)
 rename build/{appveyor => windows}/butler.bat (100%)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index cae49fdb..9b213294 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -136,7 +136,8 @@ jobs:
       uses: softprops/action-gh-release@v1
       if: >
         startsWith(github.ref, 'refs/tags/') &&
-        (!startsWith(matrix.os, 'ubuntu') || (matrix.cc == 'gcc' && matrix.cc_version == 'latest'))
+        (!startsWith(matrix.os, 'ubuntu') || (matrix.cc == 'gcc' && matrix.cc_version == 'latest'))  &&
+        github.event.release.created
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
@@ -144,7 +145,7 @@ jobs:
         fail_on_unmatched_files: true
 
     - name: Publish to itch.io (Linux)
-      if: startsWith(github.ref, 'refs/tags/') && startsWith(matrix.os, 'ubuntu') && matrix.cc == 'gcc' && matrix.cc_version == 'latest' && !github.event.release.prerelease
+      if: startsWith(github.ref, 'refs/tags/') && startsWith(matrix.os, 'ubuntu') && matrix.cc == 'gcc' && matrix.cc_version == 'latest' && github.event.release.created
       env:
         BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }}
       run: |
@@ -155,7 +156,7 @@ jobs:
         ./butler push C-Dogs*SDL-*-Linux.tar.gz congusbongus/cdogs-sdl:linux --userversion $VERSION
 
     - name: Publish to itch.io (macOS)
-      if: startsWith(github.ref, 'refs/tags/') && matrix.os == 'macos-latest' && !github.event.release.prerelease
+      if: startsWith(github.ref, 'refs/tags/') && matrix.os == 'macos-latest' && github.event.release.created
       env:
         BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }}
       run: |
@@ -164,3 +165,10 @@ jobs:
         chmod +x butler
         ./butler -V
         ./butler push C-Dogs*SDL-*-OSX.dmg congusbongus/cdogs-sdl:mac --userversion $VERSION
+
+    - name: Publish to itch.io (Windows)
+      if: startsWith(github.ref, 'refs/tags/') && matrix.os == 'windows-latest' && github.event.release.created
+      env:
+        BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }}
+      run: |
+        .\build\windows\butler.bat
diff --git a/.github/workflows/cmake.yml.cmake b/.github/workflows/cmake.yml.cmake
index 75201566..bccda6a2 100644
--- a/.github/workflows/cmake.yml.cmake
+++ b/.github/workflows/cmake.yml.cmake
@@ -136,7 +136,8 @@ jobs:
       uses: softprops/action-gh-release@v1
       if: >
         startsWith(github.ref, 'refs/tags/') &&
-        (!startsWith(matrix.os, 'ubuntu') || (matrix.cc == 'gcc' && matrix.cc_version == 'latest'))
+        (!startsWith(matrix.os, 'ubuntu') || (matrix.cc == 'gcc' && matrix.cc_version == 'latest'))  &&
+        github.event.release.created
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
@@ -144,7 +145,7 @@ jobs:
         fail_on_unmatched_files: true
 
     - name: Publish to itch.io (Linux)
-      if: startsWith(github.ref, 'refs/tags/') && startsWith(matrix.os, 'ubuntu') && matrix.cc == 'gcc' && matrix.cc_version == 'latest' && !github.event.release.prerelease
+      if: startsWith(github.ref, 'refs/tags/') && startsWith(matrix.os, 'ubuntu') && matrix.cc == 'gcc' && matrix.cc_version == 'latest' && github.event.release.created
       env:
         BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }}
       run: |
@@ -155,7 +156,7 @@ jobs:
         ./butler push C-Dogs*SDL-*-Linux.tar.gz congusbongus/cdogs-sdl:linux --userversion $VERSION
 
     - name: Publish to itch.io (macOS)
-      if: startsWith(github.ref, 'refs/tags/') && matrix.os == 'macos-latest' && !github.event.release.prerelease
+      if: startsWith(github.ref, 'refs/tags/') && matrix.os == 'macos-latest' && github.event.release.created
       env:
         BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }}
       run: |
@@ -164,3 +165,10 @@ jobs:
         chmod +x butler
         ./butler -V
         ./butler push C-Dogs*SDL-*-OSX.dmg congusbongus/cdogs-sdl:mac --userversion $VERSION
+
+    - name: Publish to itch.io (Windows)
+      if: startsWith(github.ref, 'refs/tags/') && matrix.os == 'windows-latest' && github.event.release.created
+      env:
+        BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }}
+      run: |
+        .\build\windows\butler.bat
diff --git a/appveyor.yml b/appveyor.yml
index e4d83c90..a3b0e5ca 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -62,4 +62,4 @@ deploy:
     appveyor_repo_tag: true
 
 after_deploy:
-  - .\build\appveyor\butler.bat
+  - .\build\windows\butler.bat
diff --git a/appveyor.yml.cmake b/appveyor.yml.cmake
index 4498ca35..099aac3f 100644
--- a/appveyor.yml.cmake
+++ b/appveyor.yml.cmake
@@ -62,4 +62,4 @@ deploy:
     appveyor_repo_tag: true
 
 after_deploy:
-  - .\build\appveyor\butler.bat
+  - .\build\windows\butler.bat
diff --git a/build/appveyor/butler.bat b/build/windows/butler.bat
similarity index 100%
rename from build/appveyor/butler.bat
rename to build/windows/butler.bat