From b932017a9c42c38cddea169316f20ceee0c4a919 Mon Sep 17 00:00:00 2001 From: Martijn Dirkse Date: Fri, 1 Nov 2024 11:53:49 +0100 Subject: [PATCH] Reintroduce input useRealFrontend --- .github/workflows/testing.js.yml | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/workflows/testing.js.yml b/.github/workflows/testing.js.yml index fa98bbe9..b176a82b 100644 --- a/.github/workflows/testing.js.yml +++ b/.github/workflows/testing.js.yml @@ -6,6 +6,11 @@ on: pull_request: workflow_dispatch: inputs: + useRealFrontend: + description: If true, do not check out ladybug-frontend and test the frontend inside the backend + type: boolean + default: false + required: true mergeMasterToBranch: description: If true, the checkout-out backend is merged with the backend master type: boolean @@ -175,8 +180,9 @@ jobs: run: pnpm run startServer & working-directory: ladybug-frontend - - name: Run cypress with chrome browser + - name: Run cypress with chrome browser (bypass ladybug-frontend within backend) uses: cypress-io/github-action@v6.6.0 + if: ${{ github.event.inputs.useRealFrontend != 'true' }} with: working-directory: ladybug-frontend start: | @@ -184,18 +190,14 @@ jobs: wait-on: "http://0.0.0.0:8090, http://0.0.0.0:4200" wait-on-timeout: 1000 browser: chrome - # - name: Run cypress with firefox browser - # if: ${{ github.event.inputs.useRealFrontend != 'true' }} - # uses: cypress-io/github-action@v2.9.7 - # with: - # working-directory: ladybug-frontend - # start: | - # pnpm run startCicd - # wait-on: 'http://localhost:8090, http://localhost:4200' - # wait-on-timeout: 240 - # browser: firefox - # config: screenshotsFolder=cypress/firefox/screenshots,videosFolder=cypress/firefox/videos - + - name: Run cypress with chrome browser (bypass ladybug-frontend within backend) + uses: cypress-io/github-action@v6.6.0 + if: ${{ github.event.inputs.useRealFrontend == 'true' }} + with: + working-directory: ladybug-frontend + wait-on: "http://0.0.0.0:8090" + wait-on-timeout: 1000 + browser: chrome - name: Show files run: tree -d -L 5 . if: always()