From 201f5dfd9050c78825d413f4d2f50b716fd04df6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 14 Apr 2026 16:22:48 +0100
Subject: [PATCH] Fix build-and-test.yaml skip behaviour for downstream runs

---
 .github/workflows/build-and-test.yaml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
index cad1faca0c..eb469502d9 100644
--- a/.github/workflows/build-and-test.yaml
+++ b/.github/workflows/build-and-test.yaml
@@ -104,7 +104,7 @@ jobs:
     playwright_ew:
         name: "Run Tests [${{ matrix.project }}] ${{ matrix.runner }}/${{ needs.build_ew.outputs.num-runners }}"
         needs: build_ew
-        if: needs.build_ew.outputs.skip != 'true'
+        if: needs.build_ew.outputs.skip == 'false'
         runs-on: ubuntu-24.04
         permissions:
             actions: read
@@ -184,7 +184,7 @@ jobs:
     downstream-modules:
         name: Downstream Playwright tests [element-modules]
         needs: build_ew
-        if: needs.build_ew.outputs.skip != 'true' && github.event_name == 'merge_group'
+        if: needs.build_ew.outputs.skip == 'false' && github.event_name == 'merge_group'
         uses: element-hq/element-modules/.github/workflows/reusable-playwright-tests.yml@main # zizmor: ignore[unpinned-uses]
         with:
             webapp-artifact: webapp
@@ -194,7 +194,7 @@ jobs:
         name: "Prepare Element Desktop"
         uses: ./.github/workflows/build_desktop_prepare.yaml
         needs: build_ew
-        if: needs.build_ew.outputs.skip != 'true'
+        if: needs.build_ew.outputs.skip == 'false'
         permissions:
             contents: read
         with:
@@ -253,25 +253,25 @@ jobs:
         runs-on: ubuntu-24.04
         steps:
             - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-              if: needs.build_ew.outputs.skip != 'true'
+              if: needs.build_ew.outputs.skip == 'false'
               with:
                   persist-credentials: false
                   repository: element-hq/element-web
 
             - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5
-              if: needs.build_ew.outputs.skip != 'true'
+              if: needs.build_ew.outputs.skip == 'false'
             - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
-              if: needs.build_ew.outputs.skip != 'true'
+              if: needs.build_ew.outputs.skip == 'false'
               with:
                   cache: "pnpm"
                   node-version: "lts/*"
 
             - name: Install dependencies
-              if: needs.build_ew.outputs.skip != 'true'
+              if: needs.build_ew.outputs.skip == 'false'
               run: pnpm install --frozen-lockfile
 
             - name: Download blob reports from GitHub Actions Artifacts
-              if: needs.build_ew.outputs.skip != 'true'
+              if: needs.build_ew.outputs.skip == 'false'
               uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
               with:
                   pattern: blob-report-*
@@ -279,7 +279,7 @@ jobs:
                   merge-multiple: true
 
             - name: Merge into HTML Report
-              if: needs.build_ew.outputs.skip != 'true'
+              if: needs.build_ew.outputs.skip == 'false'
               run: |
                   pnpm playwright merge-reports \
                       --config=playwright-merge.config.ts \
@@ -291,7 +291,7 @@ jobs:
 
             # Upload the HTML report even if one of our reporters fails, this can happen when stale screenshots are detected
             - name: Upload HTML report
-              if: always() && needs.build_ew.outputs.skip != 'true'
+              if: always() && needs.build_ew.outputs.skip == 'false'
               uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
               with:
                   name: html-report