Deduplicate merge queue/main CI attempt 2

.github/workflows/build-check.yml

@@ -2,7 +2,7 @@ name: DCR Build Check
 on:
   merge_group:
     types: [checks_requested]
-  push:
+  pull_request:
     paths-ignore:
       - 'dotcom-rendering/docs/**'
 

.github/workflows/cicd.yml

@@ -23,19 +23,24 @@ jobs:
       production-image-digest: ${{ needs.production-container.outputs.imageDigest }}
 
   prettier:
+    if: github.ref != 'refs/heads/main'
     uses: ./.github/workflows/prettier.yml
 
   jest:
+    if: github.ref != 'refs/heads/main'
     uses: ./.github/workflows/jest.yml
 
   lint:
+    if: github.ref != 'refs/heads/main'
     uses: ./.github/workflows/lint.yml
 
   islands:
+    if: github.ref != 'refs/heads/main'
     uses: ./.github/workflows/check-islands.yml
 
   playwright:
     needs: [container]
+    if: github.ref != 'refs/heads/main'
     uses: ./.github/workflows/playwright.yml
     with:
       container-image: ${{ needs.container.outputs.container-image }}
@@ -46,7 +51,16 @@ jobs:
       contents: read
       pull-requests: write # required by riff-raff action
     needs: [container, islands, prettier, jest, lint, playwright]
-    if: github.event_name == 'push' # We don't need a riff-raff deployment for merge_group events
+    # We don't need a riff-raff deployment for merge_group events.
+    # `!cancelled()` forces this job to be evaluated even when some of the
+    # `needs` jobs are skipped (the checks are skipped on push to main), and
+    # `!contains(needs.*.result, 'failure')` still blocks publish if any needed
+    # job actually failed. Without a status-check function here, a skipped
+    # dependency would cause this job to be skipped as well.
+    if: >-
+      !cancelled() &&
+      !contains(needs.*.result, 'failure') &&
+      github.event_name == 'push'
     uses: ./.github/workflows/publish.yml
     with:
       container-image: ${{ needs.container.outputs.container-image }}

.github/workflows/dcr-chromatic.yml

@@ -3,8 +3,6 @@ name: DCR Chromatic 👓
 on:
   merge_group:
     types: [checks_requested]
-  push:
-    branches: [main]
   pull_request:
     types: [opened, labeled, synchronize]
 
@@ -31,14 +29,14 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Checkout - On Push Event
         uses: actions/checkout@v6
-        if: ${{ github.event_name == 'push' || github.event_name == 'merge_group' }}
+        if: ${{ github.event_name == 'merge_group' }}
         with:
           fetch-depth: 0
 
       - name: Set up Node environment
         # Only needed for a full Chromatic run.
         if: |
-          (github.event_name == 'push' || github.event_name == 'merge_group') ||
+          github.event_name == 'merge_group' ||
           (github.event_name == 'pull_request' &&
             contains(github.event.pull_request.labels.*.name, 'run_chromatic'))
         uses: ./.github/actions/setup-node-env
@@ -51,7 +49,7 @@ jobs:
           NODE_OPTIONS: '--max_old_space_size=4096'
         uses: chromaui/action@v17.4.1
         if: |
-          (github.event_name == 'push' || github.event_name == 'merge_group') ||
+          github.event_name == 'merge_group' ||
           (github.event_name == 'pull_request' &&
             contains(github.event.pull_request.labels.*.name, 'run_chromatic')) ||
           (github.event_name == 'pull_request' && needs.check-paths.outputs.relevant != 'true')

.github/workflows/schema-check.yml

@@ -2,7 +2,7 @@ name: DCR Schema Check
 on:
   merge_group:
     types: [checks_requested]
-  push:
+  pull_request:
     paths-ignore:
       - 'dotcom-rendering/docs/**'
 

.github/workflows/stories-check.yml

@@ -2,7 +2,7 @@ name: DCR Stories Check
 on:
   merge_group:
     types: [checks_requested]
-  push:
+  pull_request:
     paths-ignore:
       - 'dotcom-rendering/docs/**'
 

.github/workflows/typescript.yml

@@ -2,7 +2,7 @@ name: DCR typescript 🕵‍♀
 on:
   merge_group:
     types: [checks_requested]
-  push:
+  pull_request:
     paths-ignore:
       - 'dotcom-rendering/docs/**'