Revert "ci: run MSYS on upload only"

This reverts commit ee824c7.
cataclysmbnteam · Nov 2, 2023 · d68920c · d68920c
1 parent 83e1af4
commit d68920c
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 6 deletions.
diff --git a/.github/workflows/msys2-cmake.yml b/.github/workflows/msys2-cmake.yml
@@ -1,4 +1,4 @@
-name: Windows build (CMake + MSYS2)
+name: Cataclysm Windows build (CMake + MSYS2)
 
 on:
   push:
@@ -15,10 +15,24 @@ on:
     - '!tools/format/**'
     - 'utilities/**'
     - 'scripts/**'
+  pull_request:
+    branches:
+    - upload
+    paths-ignore:
+    - 'android/**'
+    - 'build-data/osx/**'
+    - 'doc/**'
+    - 'doxygen_doc/**'
+    - 'gfx/**'
+    - 'lang/**'
+    - 'tools/**'
+    - '!tools/format/**'
+    - 'utilities/**'
+    - 'scripts/**'
 
-# We only care about the latest revision, so cancel previous instances.
+# We only care about the latest revision of a PR, so cancel previous instances.
 concurrency:
-  group: msys2-cmake-build-${{ github.ref_name }}
+  group: msys2-cmake-build-${{ github.event.pull_request.number || github.ref_name }}
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml
@@ -1,4 +1,4 @@
-name: Windows build (MSYS2)
+name: Cataclysm Windows build (MSYS2)
 
 on:
   push:
@@ -15,10 +15,24 @@ on:
     - '!tools/format/**'
     - 'utilities/**'
     - 'scripts/**'
+  pull_request:
+    branches:
+    - upload
+    paths-ignore:
+    - 'android/**'
+    - 'build-data/osx/**'
+    - 'doc/**'
+    - 'doxygen_doc/**'
+    - 'gfx/**'
+    - 'lang/**'
+    - 'tools/**'
+    - '!tools/format/**'
+    - 'utilities/**'
+    - 'scripts/**'
 
-# We only care about the latest revision, so cancel previous instances.
+# We only care about the latest revision of a PR, so cancel previous instances.
 concurrency:
-  group: msys2-build-${{ github.ref_name }}
+  group: msys2-build-${{ github.event.pull_request.number || github.ref_name }}
   cancel-in-progress: true
 
 jobs: