Merge branch 'main' into alpha

Kurocado-Studio · Oct 24, 2024 · 4ac1211 · 4ac1211
2 parents a95d4cf + 3a2d893
commit 4ac1211
Showing 1 changed file with 19 additions and 6 deletions.
diff --git a/.github/workflows/composite.release.yml b/.github/workflows/composite.release.yml
@@ -12,12 +12,25 @@ jobs:
   release:
     runs-on: ubuntu-latest
     if: |
-      github.event_name == 'push' && (
-        github.ref == 'refs/heads/alpha' ||
-        github.ref == 'refs/heads/beta' ||
-        github.ref == 'refs/heads/canary' ||
-        github.ref == 'refs/heads/main' ||
-        github.ref == 'refs/heads/pre/rc'
+      (
+        github.event_name == 'push' &&
+        (
+          github.ref == 'refs/heads/main' ||
+          github.ref == 'refs/heads/alpha' ||
+          github.ref == 'refs/heads/beta' ||
+          github.ref == 'refs/heads/canary' ||
+          github.ref == 'refs/heads/pre/rc'
+        )
+      ) ||
+      (
+        github.event_name == 'pull_request' &&
+        (
+          github.base_ref == 'main' ||
+          github.base_ref == 'alpha' ||
+          github.base_ref == 'beta' ||
+          github.base_ref == 'canary' ||
+          github.base_ref == 'pre/rc'
+        )
       )
     steps:
       - name: Checkout