From 7db221767e7f50b2f1a217050d075f2a10bdda51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 8 Jun 2022 20:52:50 +0200 Subject: [PATCH 1/3] Reenable multiple cypress ocntainers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- .github/workflows/cypress.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index 567ffa9bfc8..79cbfd818d2 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -20,7 +20,7 @@ jobs: fail-fast: false matrix: node-version: [14] - # containers: [1, 2, 3] + containers: [1, 2, 3] php-versions: [ '7.4' ] databases: [ 'sqlite' ] server-versions: [ 'stable24' ] @@ -105,7 +105,7 @@ jobs: uses: cypress-io/github-action@v3 with: record: true - parallel: false + parallel: true wait-on: '${{ env.CYPRESS_baseUrl }}' working-directory: 'apps/${{ env.APP_NAME }}' config: defaultCommandTimeout=10000,video=false From 2b721df07dba28f5850efbde743b8d14e4b701ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 8 Jun 2022 20:54:52 +0200 Subject: [PATCH 2/3] No need to build viewer anymore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The header does no longer autohide so we can skip the manual testing build Signed-off-by: Julius Härtl --- .github/workflows/cypress.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index 79cbfd818d2..952b12f27ba 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -54,12 +54,6 @@ jobs: ref: ${{ matrix.server-versions }} path: apps/viewer - - name: npm install, build viewer in testing mode - working-directory: apps/viewer - run: | - npm ci - TESTING=true npm run build - - name: Checkout ${{ env.APP_NAME }} uses: actions/checkout@v3 with: From 58fc7fa2a2e5620cab2b9955529d54c3400eef5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 8 Jun 2022 21:12:35 +0200 Subject: [PATCH 3/3] Add one more container MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- .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 952b12f27ba..50b022a3974 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -20,7 +20,7 @@ jobs: fail-fast: false matrix: node-version: [14] - containers: [1, 2, 3] + containers: [1, 2, 3, 4] php-versions: [ '7.4' ] databases: [ 'sqlite' ] server-versions: [ 'stable24' ]