From 1ad433dcad848d8b33fc0cf1b8ab9d290e350d66 Mon Sep 17 00:00:00 2001
From: marcellmueller <marcel@button.is>
Date: Thu, 19 Sep 2024 10:21:27 -0700
Subject: [PATCH] chore: test

---
 .github/workflows/main.yaml                | 9 +++++----
 .github/workflows/test-nx-project-e2e.yaml | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 8b56efb68d..47a70dd5c7 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -33,6 +33,7 @@ jobs:
         run: |
           NX_AFFECTED_E2E=$(yarn nx show projects --affected --with-target e2e:ci --base=origin/develop)
           echo "NX_AFFECTED_E2E="$NX_AFFECTED_E2E"" >> "$GITHUB_OUTPUT"
+
         working-directory: ./bciers
         shell: bash
   build-backend:
@@ -71,7 +72,7 @@ jobs:
       nx_project: administration
       nx_app_port: 4001
       image_url: "ghcr.io/bcgov/cas-admin-frontend"
-      is_nx_affected: ${{contains(needs.check-nx-affected.outputs.NX_AFFECTED_E2E, 'administration') || github.ref_name == 'develop' || github.ref_name == 'main' || github.ref_name == 'test-e2e-merge'}}
+      is_nx_affected: ${{contains(needs.check-nx-affected.outputs.NX_AFFECTED_E2E, 'administration') || github.ref_name == 'develop' || github.ref_name == 'main' || github.ref_name == 'test-e2e-merge' || github.head_ref == 'develop' || github.head_ref == 'main' || github.head_ref == 'test-e2e-merge'}}
     secrets: inherit
   test-coam-e2e:
     needs: [build-backend, build-dashboard-e2e, build-coam, check-nx-affected]
@@ -80,7 +81,7 @@ jobs:
       nx_project: coam
       nx_app_port: 7000
       image_url: "ghcr.io/bcgov/cas-coam-frontend"
-      is_nx_affected: ${{contains(needs.check-nx-affected.outputs.NX_AFFECTED_E2E, 'coam') || github.ref_name == 'develop' || github.ref_name == 'main' || github.ref_name == 'test-e2e-merge'}}
+      is_nx_affected: ${{contains(needs.check-nx-affected.outputs.NX_AFFECTED_E2E, 'coam') || github.ref_name == 'develop' || github.ref_name == 'main' || github.ref_name == 'test-e2e-merge' || github.head_ref == 'develop' || github.head_ref == 'main' || github.head_ref == 'test-e2e-merge'}}
     secrets: inherit
   test-reporting-e2e:
     needs:
@@ -90,7 +91,7 @@ jobs:
       nx_project: reporting
       nx_app_port: 5000
       image_url: "ghcr.io/bcgov/cas-rep-frontend"
-      is_nx_affected: ${{contains(needs.check-nx-affected.outputs.NX_AFFECTED_E2E, 'reporting') || github.ref_name == 'develop' || github.ref_name == 'main' || github.ref_name == 'test-e2e-merge'}}
+      is_nx_affected: ${{contains(needs.check-nx-affected.outputs.NX_AFFECTED_E2E, 'reporting') || github.ref_name == 'develop' || github.ref_name == 'main' || github.ref_name == 'test-e2e-merge' || github.head_ref == 'develop' || github.head_ref == 'main' || github.head_ref == 'test-e2e-merge'}}
     secrets: inherit
   test-registration1-e2e:
     needs: [build-backend, build-registration1, check-nx-affected]
@@ -109,7 +110,7 @@ jobs:
       nx_project: registration
       nx_app_port: 4000
       image_url: "ghcr.io/bcgov/cas-reg-frontend"
-      is_nx_affected: ${{contains(needs.check-nx-affected.outputs.NX_AFFECTED_E2E, 'registration') || github.ref_name == 'develop' || github.ref_name == 'main' || github.ref_name == 'test-e2e-merge'}}
+      is_nx_affected: ${{contains(needs.check-nx-affected.outputs.NX_AFFECTED_E2E, 'registration') || github.ref_name == 'develop' || github.ref_name == 'main' || github.ref_name == 'test-e2e-merge' || github.head_ref == 'develop' || github.head_ref == 'main' || github.head_ref == 'test-e2e-merge'}}
     secrets: inherit
   e2e-finalize:
     needs:
diff --git a/.github/workflows/test-nx-project-e2e.yaml b/.github/workflows/test-nx-project-e2e.yaml
index 089f25cdb3..548221a4c4 100644
--- a/.github/workflows/test-nx-project-e2e.yaml
+++ b/.github/workflows/test-nx-project-e2e.yaml
@@ -151,7 +151,7 @@ jobs:
 
   # Call Happo api and skip the project if it wasn't affected
   happo-skip-not-affected:
-    if: ${{ !inputs.is_nx_affected && github.ref_name != 'develop' && github.ref_name != 'main' && github.ref_name != 'test-e2e-merge' }}
+    if: ${{ !inputs.is_nx_affected && github.ref_name != 'develop' && github.ref_name != 'main' && github.ref_name != 'test-e2e-merge' && github.head_ref != 'develop' && github.head_ref != 'main' && github.head_ref != 'test-e2e-merge' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4