From d09577ff9ffa5b233f2c137ec33bfca76e2a968f Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Thu, 29 Jun 2023 20:19:42 +0000 Subject: [PATCH 1/2] Updating cypress.yml workflow from template Signed-off-by: Nextcloud bot --- .github/workflows/cypress.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index 34942e9f8..19ccf5aad 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -11,7 +11,12 @@ on: env: # Adjust APP_NAME if your repository name is different APP_NAME: ${{ github.event.repository.name }} - BRANCH: ${{ github.base_ref }} + + # This represents the server branch to checkout. + # Usually it's the base branch of the PR, but for pushes it's the branch itself. + # e.g. 'main', 'stable27' or 'feature/my-feature + # n.b. server will use head_ref, as we want to test the PR branch. + BRANCH: ${{ github.base_ref || github.ref_name }} jobs: init: @@ -69,7 +74,7 @@ jobs: matrix: # Run multiple copies of the current job in parallel # Please increase the number or runners as your tests suite grows - containers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] + containers: ["component", 1, 2, 3] name: runner ${{ matrix.containers }} @@ -94,6 +99,9 @@ jobs: with: record: true parallel: true + # cypress run type + component: ${{ matrix.containers == 'component' }} + group: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }} # cypress env ci-build-id: ${{ github.sha }}-${{ github.run_number }} tag: ${{ github.event_name }} From 8390bab1d3e68a9939703ef576d3a88f77446fda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6?= Date: Thu, 29 Jun 2023 22:21:35 +0200 Subject: [PATCH 2/2] chore: keep containers matrix from template update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ --- .github/workflows/cypress.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index 19ccf5aad..be4383e81 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -74,7 +74,7 @@ jobs: matrix: # Run multiple copies of the current job in parallel # Please increase the number or runners as your tests suite grows - containers: ["component", 1, 2, 3] + containers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] name: runner ${{ matrix.containers }}