From 48212e97da4d323a1821c649130624f0291adf42 Mon Sep 17 00:00:00 2001
From: Max <max@nextcloud.com>
Date: Mon, 11 Sep 2023 17:26:45 +0200
Subject: [PATCH] test(ci): use a single runner for cypress tests

Signed-off-by: Max <max@nextcloud.com>
---
 .github/workflows/cypress.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
index 2f866fdd31d..4b439c317b8 100644
--- a/.github/workflows/cypress.yml
+++ b/.github/workflows/cypress.yml
@@ -83,22 +83,22 @@ jobs:
         containers: [1, 2, 3, 4, 5, 6, 7, 8]
         php-versions: [ '8.1' ]
         server-versions: [ 'master' ]
-        is-pr:
-          - ${{ !!github.head_ref }}
+        run-in-parallel:
+          - false # only for PRs: ${{ !!github.head_ref }}
         exclude:
-          - is-pr: false
+          - run-in-parallel: false
             containers: 2
-          - is-pr: false
+          - run-in-parallel: false
             containers: 3
-          - is-pr: false
+          - run-in-parallel: false
             containers: 4
-          - is-pr: false
+          - run-in-parallel: false
             containers: 5
-          - is-pr: false
+          - run-in-parallel: false
             containers: 6
-          - is-pr: false
+          - run-in-parallel: false
             containers: 7
-          - is-pr: false
+          - run-in-parallel: false
             containers: 8
 
     name: runner ${{ matrix.containers }}
@@ -162,12 +162,12 @@ jobs:
       - name: Cypress run
         uses: cypress-io/github-action@v4
         with:
-          record: '${{ !!matrix.is-pr }}' # only on pull requests
-          parallel: '${{ !!matrix.is-pr }}' # only on pull requests
+          record: '${{ !!matrix.run-in-parallel }}' # only on pull requests
+          parallel: '${{ !!matrix.run-in-parallel }}' # only on pull requests
           wait-on: '${{ env.CYPRESS_baseUrl }}'
           working-directory: 'apps/${{ env.APP_NAME }}'
           config: defaultCommandTimeout=10000,video=false
-          tag: ${{ matrix.is-pr && github.event_name }}
+          tag: ${{ matrix.run-in-parallel && github.event_name }}
         env:
           # https://github.com/cypress-io/github-action/issues/124
           COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}