Iterate

Author: t3chguy

.github/workflows/build-and-test.yaml

@@ -16,7 +16,8 @@ on:
     merge_group:
         types: [checks_requested]
     push:
-        branches: [develop, staging, master]
+        # We do not build on push to develop as the merge_group check handles that
+        branches: [staging, master]
     repository_dispatch:
         types: [element-web-notify]
 
@@ -218,7 +219,7 @@ jobs:
 
     build_ed_windows:
         needs: prepare_ed
-        name: "ED Windows"
+        name: "Desktop Windows"
         uses: ./.github/workflows/build_desktop_windows.yaml
         if: inputs.skip != true
         strategy:
@@ -230,7 +231,7 @@ jobs:
 
     build_ed_linux:
         needs: prepare_ed
-        name: "ED Linux (${{ matrix.arch }}) (sqlcipher: ${{ matrix.sqlcipher }})"
+        name: "Desktop Linux"
         uses: ./.github/workflows/build_desktop_linux.yaml
         if: inputs.skip != true
         strategy:
@@ -244,7 +245,7 @@ jobs:
 
     build_ed_macos:
         needs: prepare_ed
-        name: "ED macOS"
+        name: "Desktop macOS"
         uses: ./.github/workflows/build_desktop_macos.yaml
         if: inputs.skip != true
         with:

.github/workflows/build_desktop_test.yaml

@@ -85,11 +85,14 @@ jobs:
                   EXECUTABLE: ${{ steps.executable.outputs.path }}
 
             - name: Run tests
-              uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a
               timeout-minutes: 20
-              with:
-                  run: pnpm -C apps/desktop test ${{ runner.os != 'Linux' && '--ignore-snapshots' || '' }} ${{ inputs.blob_report == false && '--reporter=html' || '' }} ${{ inputs.args }}
+              run: |
+                  $PREFIX pnpm -C apps/desktop test \
+                      ${{ runner.os != 'Linux' && '--ignore-snapshots' || '' }} \
+                      ${{ inputs.blob_report == false && '--reporter=html' || '' }} \
+                      ${{ inputs.args }}
               env:
+                  PREFIX: ${{ runner.os == 'Linux' && 'xvfb-run' || '' }}
                   PW_TAG: ${{ inputs.project }}
                   ELEMENT_DESKTOP_EXECUTABLE: ${{ steps.executable.outputs.path }}