From 417b412efb69a45ab49f08bf457a9a73b51d8cca Mon Sep 17 00:00:00 2001
From: Shane Garrity <shanedgarrity@gmail.com>
Date: Sun, 21 Apr 2024 12:22:25 -0400
Subject: [PATCH] build: use branch build for all branches

---
 .github/workflows/branch.yml  | 17 +++++------------
 .github/workflows/main.yml    |  3 ++-
 .github/workflows/staging.yml |  3 +++
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml
index 1f4a277d..f9e6ca04 100644
--- a/.github/workflows/branch.yml
+++ b/.github/workflows/branch.yml
@@ -1,11 +1,12 @@
 name: GitHub Actions CI (Branch)
 
+# TODO: FIXME: can we run on all pushes except those associated with a pull request to main (staging.yml)?
+
 on:
-  pull_request:
-    branches: [ "main" ]
-  # TODO: FIXME: how to trigger on push to all branches?
   push:
-    branches: [ "dev-pipeline" ]
+    branches-ignore:
+    - main
+    - 'stage/**'
 
 # TODO: what version of node are we getting and why? rush.json? actions default?
 
@@ -40,11 +41,3 @@ jobs:
     with:
       ENVIRONMENT: ${{ vars.ENVIRONMENT }}
     secrets: inherit
-
-  # TODO: FIXME: deploy should only run on merge to main or push to stage/** branches
-  deploy:
-    needs: [install, build, unit-test, e2e-test, lint]
-    uses: ./.github/workflows/deploy.yml
-    with:
-      ENVIRONMENT: ${{ vars.ENVIRONMENT }}
-    secrets: inherit
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d3e80fea..a8a99ea6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -2,7 +2,8 @@ name: GitHub Actions CI (Main)
 
 on:
   push:
-    branches: [ "main" ]
+    branches:
+    - main
 
 jobs:
   main-install:
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index 4afeae24..3db75b8d 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -1,6 +1,9 @@
 name: GitHub Actions CI (Staging Deploy)
 
 on:
+  pull_request:
+    branches:
+    - main
   push:
     branches:
     - 'stage/**'