feat: speed up merge workflow (#551)

bcgov · May 14, 2024 · 601d9d6 · 601d9d6
1 parent ffa0097
commit 601d9d6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,8 +4,7 @@ on:
   pull_request:
     types: ["opened", "reopened", "synchronize", "ready_for_review"]
   push:
-    branches:
-      - main
+    branches: [main]
   workflow_dispatch:
 
 concurrency:

diff --git a/.github/workflows/merge-main.yml → .github/workflows/merge.yml b/.github/workflows/merge-main.yml → .github/workflows/merge.yml
@@ -1,9 +1,9 @@
-name: Merge to Main
+name: Merge
 
 on:
-  push:
-    branches:
-      - main
+  workflow_run:
+    workflows: [PR Closed]
+    types: [completed]
   workflow_dispatch:
 
 concurrency:
@@ -69,9 +69,7 @@ jobs:
 
   deploy-test:
     name: TEST Deployment
-    needs:
-      - codeql
-      - init-test
+    needs: [init-test]
     environment: test
     runs-on: ubuntu-22.04
     strategy:

diff --git a/.github/workflows/pr-close.yml b/.github/workflows/pr-close.yml
@@ -1,4 +1,4 @@
-name: PR Close
+name: PR Closed
 
 on:
   pull_request: