chore: test

bcgov · Sep 19, 2024 · eb8607d · eb8607d
1 parent 05d42c2
commit eb8607d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -4,7 +4,7 @@ name: main
 
 on:
   push:
-    branches: [develop, main]
+    branches: [develop, main, test-e2e-merge]
   pull_request:
     branches: [develop, main]
   workflow_dispatch:
@@ -71,7 +71,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 == 'refs/heads/develop' || github.ref == 'refs/heads/main'}}
+      is_nx_affected: ${{contains(needs.check-nx-affected.outputs.NX_AFFECTED_E2E, 'administration') || github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/test-e2e-merge'}}
     secrets: inherit
   test-coam-e2e:
     needs: [build-backend, build-dashboard-e2e, build-coam, check-nx-affected]
@@ -80,7 +80,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 == 'refs/heads/develop' || github.ref == 'refs/heads/main'}}
+      is_nx_affected: ${{contains(needs.check-nx-affected.outputs.NX_AFFECTED_E2E, 'coam') || github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/test-e2e-merge'}}
     secrets: inherit
   test-reporting-e2e:
     needs:
@@ -90,7 +90,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 == 'refs/heads/develop' || github.ref == 'refs/heads/main'}}
+      is_nx_affected: ${{contains(needs.check-nx-affected.outputs.NX_AFFECTED_E2E, 'reporting') || github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/test-e2e-merge'}}
     secrets: inherit
   test-registration1-e2e:
     needs: [build-backend, build-registration1, check-nx-affected]
@@ -109,7 +109,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 == 'refs/heads/develop' || github.ref == 'refs/heads/main'}}
+      is_nx_affected: ${{contains(needs.check-nx-affected.outputs.NX_AFFECTED_E2E, 'registration') || github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/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
@@ -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 != 'refs/heads/develop' && github.ref != 'refs/heads/main'
+    if: ${{ !inputs.is_nx_affected }} && github.ref != 'refs/heads/develop' && github.ref != 'refs/heads/main' && github.ref != 'refs/heads/test-e2e-merge'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4