From 92c46cdbeb8889c026c9b6483523a12e811884b4 Mon Sep 17 00:00:00 2001 From: eirikhaugstulen Date: Fri, 20 Oct 2023 20:23:41 +0200 Subject: [PATCH] chore: test --- .github/workflows/e2e-tests.yml | 8 ++++---- .github/workflows/preview.yml | 10 +++++----- .github/workflows/verify-app.yml | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 6e92b4aae2..40d58265b8 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -78,18 +78,17 @@ jobs: needs: prerequisites if: contains(fromJson(needs.prerequisites.outputs.json-labels), github.event.label.name) runs-on: ubuntu-latest - container: cypress/browsers:node14.7.0-chrome84 strategy: fail-fast: false matrix: versions: ${{ fromJSON(needs.prerequisites.outputs.versions) }} containers: ${{ fromJSON(needs.prerequisites.outputs.matrix-containers) }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v3 with: - node-version: 14.x + node-version: 18.x - name: compute-instance-url id: instance-url @@ -115,6 +114,7 @@ jobs: CYPRESS_dhis2InstanceVersion: ${{matrix.versions}} CYPRESS_dhis2Username: ${{ secrets.CYPRESS_DHIS2_USERNAME }} CYPRESS_dhis2Password: ${{ secrets.CYPRESS_DHIS2_PASSWORD }} + NODE_OPTIONS: "--openssl-legacy-provider" call-e2e-tests-result: needs: cypress diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index bbef3256d9..ddea1ad671 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -4,22 +4,22 @@ on: pull_request: types: [ labeled ] -jobs: +jobs: preview: runs-on: ubuntu-latest if: (github.event.label.name == 'preview' || github.event.label.name == 'testing') && !github.event.push.repository.fork && github.actor != 'dependabot[bot]' steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v1 + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 with: - node-version: 14.x + node-version: 18.x - uses: actions/cache@v2 id: yarn-cache with: path: '**/node_modules' key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - + - name: Install if: steps.yarn-cache.outputs.cache-hit != 'true' run: yarn install --frozen-lockfile diff --git a/.github/workflows/verify-app.yml b/.github/workflows/verify-app.yml index 31f099ced0..4877b7ceed 100644 --- a/.github/workflows/verify-app.yml +++ b/.github/workflows/verify-app.yml @@ -94,7 +94,7 @@ jobs: instance-version: runs-on: ubuntu-latest - needs: install # [lint, flow, unit-tests] + needs: [lint, flow, unit-tests] if: "!(startsWith(github.event.head_commit.message, 'fix(translations)') && github.actor == 'dhis2-bot') && !contains(github.event.head_commit.message, '[skip ci]')" outputs: version: ${{ steps.instance-version.outputs.version }}