chore: test

bcgov · Sep 19, 2024 · c380617 · c380617
1 parent 1ad433d
commit c380617
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -21,6 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       NX_AFFECTED_E2E: ${{steps.check-nx-affected.outputs.NX_AFFECTED_E2E}}
+      RUN_ALL_E2E: ${{ steps.check-nx-affected.outputs.RUN_ALL_E2E }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -33,6 +34,8 @@ 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"
+          BRANCH_NAME=${{ github.head_ref || github.ref_name }}
+          echo "RUN_ALL_E2E="$BRANCH_NAME == 'develop' || $BRANCH_NAME == 'main' || $BRANCH_NAME == 'test-e2e-merge'"" >> "$GITHUB_OUTPUT"
 
         working-directory: ./bciers
         shell: bash
@@ -72,7 +75,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' || github.head_ref == 'develop' || github.head_ref == 'main' || github.head_ref == 'test-e2e-merge'}}
+      is_nx_affected: ${{contains(needs.check-nx-affected.outputs.NX_AFFECTED_E2E, 'administration') || needs.check-nx-affected.outputs.RUN_ALL_E2E}}
     secrets: inherit
   test-coam-e2e:
     needs: [build-backend, build-dashboard-e2e, build-coam, check-nx-affected]
@@ -81,7 +84,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' || github.head_ref == 'develop' || github.head_ref == 'main' || github.head_ref == 'test-e2e-merge'}}
+      is_nx_affected: ${{contains(needs.check-nx-affected.outputs.NX_AFFECTED_E2E, 'coam') || needs.check-nx-affected.outputs.RUN_ALL_E2E}}
     secrets: inherit
   test-reporting-e2e:
     needs:
@@ -91,7 +94,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' || github.head_ref == 'develop' || github.head_ref == 'main' || github.head_ref == 'test-e2e-merge'}}
+      is_nx_affected: ${{contains(needs.check-nx-affected.outputs.NX_AFFECTED_E2E, 'reporting') || needs.check-nx-affected.outputs.RUN_ALL_E2E}}
     secrets: inherit
   test-registration1-e2e:
     needs: [build-backend, build-registration1, check-nx-affected]
@@ -110,7 +113,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' || github.head_ref == 'develop' || github.head_ref == 'main' || github.head_ref == 'test-e2e-merge'}}
+      is_nx_affected: ${{contains(needs.check-nx-affected.outputs.NX_AFFECTED_E2E, 'registration') || needs.check-nx-affected.outputs.RUN_ALL_E2E}}
     secrets: inherit
   e2e-finalize:
     needs: