From 411963201ad18031b2b193e2581153e2f9c1c92c Mon Sep 17 00:00:00 2001 From: Lukas Harbarth Date: Tue, 11 Feb 2025 17:56:31 +0100 Subject: [PATCH 01/11] chore(coverage): ignore `dist` folders --- cypress.config.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cypress.config.ts b/cypress.config.ts index 6f2f0e433ed..0d2be81033b 100644 --- a/cypress.config.ts +++ b/cypress.config.ts @@ -14,7 +14,8 @@ export default defineConfig({ 'packages/*/src/index.ts', 'packages/main/src/components/AnalyticalTable/types/*', 'packages/main/src/webComponents/**', - 'packages/charts/src/resources/**' + 'packages/charts/src/resources/**', + '**/dist/**' ] } }, From 9da27a59b7d79652291de36eed665821459bdffd Mon Sep 17 00:00:00 2001 From: Lukas Harbarth Date: Wed, 12 Feb 2025 11:16:14 +0100 Subject: [PATCH 02/11] debug --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5416e45a414..ed9b44619d1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -68,4 +68,5 @@ jobs: with: github-token: ${{ secrets.GITHUB_TOKEN }} parallel-finished: true + debug: true carryforward: 'base,charts,cypress-commands,main/src/components,main/src/internal' From e39036055e6d683a6bafe22250e95fb0e2974916 Mon Sep 17 00:00:00 2001 From: Lukas Harbarth Date: Wed, 12 Feb 2025 11:53:32 +0100 Subject: [PATCH 03/11] checkout --- .github/workflows/test.yml | 2 ++ cypress.config.ts | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ed9b44619d1..ea871bf127f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -63,6 +63,8 @@ jobs: name: 'Combine Coverage' runs-on: ubuntu-latest steps: + - name: Checkout + uses: actions/checkout@v4 - name: Coveralls uses: coverallsapp/github-action@v2.3.6 with: diff --git a/cypress.config.ts b/cypress.config.ts index 0d2be81033b..aed12c5249b 100644 --- a/cypress.config.ts +++ b/cypress.config.ts @@ -27,7 +27,8 @@ export default defineConfig({ devServer: { framework: 'react', bundler: 'vite' - } + }, + excludeSpecPattern: '**/e2e/**' }, includeShadowDom: true, viewportWidth: 1920, From f678dd26794fa3e5628ad2e7ec598aef9ee6a86d Mon Sep 17 00:00:00 2001 From: Lukas Harbarth Date: Wed, 12 Feb 2025 12:44:19 +0100 Subject: [PATCH 04/11] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ea871bf127f..5d504a7e06c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -58,8 +58,8 @@ jobs: flag-name: ${{ matrix.spec }} coveralls: - if: ${{ always() && inputs.reportCoverage }} needs: ['cypress'] + if: ${{ always() && inputs.reportCoverage }} name: 'Combine Coverage' runs-on: ubuntu-latest steps: From 31c0b2da550a2f931b1b6491165f60c0f08eb164 Mon Sep 17 00:00:00 2001 From: Lukas Harbarth Date: Wed, 12 Feb 2025 12:58:08 +0100 Subject: [PATCH 05/11] Update test.yml --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5d504a7e06c..76971f2688a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -68,7 +68,6 @@ jobs: - name: Coveralls uses: coverallsapp/github-action@v2.3.6 with: - github-token: ${{ secrets.GITHUB_TOKEN }} parallel-finished: true debug: true carryforward: 'base,charts,cypress-commands,main/src/components,main/src/internal' From 05ae3c7a318361d10dd8d289b5babef6422dde55 Mon Sep 17 00:00:00 2001 From: Lukas Harbarth Date: Wed, 12 Feb 2025 14:32:49 +0100 Subject: [PATCH 06/11] Update test.yml --- .github/workflows/test.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 76971f2688a..81e1a1f0ca9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,7 +21,6 @@ jobs: - main/src/components - main/src/internal - compat - react: ['18', '19'] fail-fast: false steps: - name: Checkout @@ -35,12 +34,6 @@ jobs: - name: Install run: yarn install --immutable - - name: Install 18 - if: ${{ matrix.react == '18' }} - run: | - yarn add "@types/react@18" "@types/react-dom@18" --dev - yarn add react@18 react-dom@18 - - name: Cypress run uses: cypress-io/github-action@v6 with: @@ -50,7 +43,6 @@ jobs: install: false - uses: coverallsapp/github-action@v2.3.6 - if: ${{ inputs.reportCoverage && matrix.react == '19' }} with: file: temp/cypress-coverage/lcov.info github-token: ${{ secrets.GITHUB_TOKEN }} @@ -65,6 +57,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + - name: Coveralls uses: coverallsapp/github-action@v2.3.6 with: From 92952f044c557caa52da93abcd58e16594e77115 Mon Sep 17 00:00:00 2001 From: Lukas Harbarth Date: Wed, 12 Feb 2025 14:54:40 +0100 Subject: [PATCH 07/11] Update test.yml --- .github/workflows/test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 81e1a1f0ca9..2cf9a990bcc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,6 +10,8 @@ on: jobs: cypress: + env: + COVERALLS_PARALLEL: true name: Cypress runs-on: ubuntu-latest strategy: @@ -51,7 +53,7 @@ jobs: coveralls: needs: ['cypress'] - if: ${{ always() && inputs.reportCoverage }} + if: ${{ always() }} name: 'Combine Coverage' runs-on: ubuntu-latest steps: From 41ecdd3b532b279cf32a2efa15af4711cf610b9c Mon Sep 17 00:00:00 2001 From: Lukas Harbarth Date: Wed, 12 Feb 2025 15:11:44 +0100 Subject: [PATCH 08/11] Update test.yml --- .github/workflows/test.yml | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2cf9a990bcc..84e0cf2ce08 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,12 +17,8 @@ jobs: strategy: matrix: spec: - - base - - charts - - cypress-commands - main/src/components - - main/src/internal - - compat + fail-fast: false steps: - name: Checkout @@ -41,28 +37,9 @@ jobs: with: browser: chrome component: true - spec: packages/${{ matrix.spec }} + spec: packages/main/src/components install: false - uses: coverallsapp/github-action@v2.3.6 with: - file: temp/cypress-coverage/lcov.info github-token: ${{ secrets.GITHUB_TOKEN }} - parallel: true - flag-name: ${{ matrix.spec }} - - coveralls: - needs: ['cypress'] - if: ${{ always() }} - name: 'Combine Coverage' - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Coveralls - uses: coverallsapp/github-action@v2.3.6 - with: - parallel-finished: true - debug: true - carryforward: 'base,charts,cypress-commands,main/src/components,main/src/internal' From 67c43dea09418f89ec130c257de04b2b1c2a76cb Mon Sep 17 00:00:00 2001 From: Lukas Harbarth Date: Wed, 12 Feb 2025 15:23:15 +0100 Subject: [PATCH 09/11] Update test.yml --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 84e0cf2ce08..6f0e41d72bf 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,3 +43,4 @@ jobs: - uses: coverallsapp/github-action@v2.3.6 with: github-token: ${{ secrets.GITHUB_TOKEN }} + file: temp/cypress-coverage/lcov.info From 68b38b29406538bf45febf8fa1b9703135d51a58 Mon Sep 17 00:00:00 2001 From: Lukas Harbarth Date: Wed, 12 Feb 2025 15:27:59 +0100 Subject: [PATCH 10/11] Update test.yml --- .github/workflows/test.yml | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6f0e41d72bf..3635c1892c5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,15 +10,18 @@ on: jobs: cypress: - env: - COVERALLS_PARALLEL: true name: Cypress runs-on: ubuntu-latest strategy: matrix: spec: + - base + - charts + - cypress-commands - main/src/components - + - main/src/internal + - compat + react: ['18', '19'] fail-fast: false steps: - name: Checkout @@ -32,15 +35,37 @@ jobs: - name: Install run: yarn install --immutable + - name: Install 18 + if: ${{ matrix.react == '18' }} + run: | + yarn add "@types/react@18" "@types/react-dom@18" --dev + yarn add react@18 react-dom@18 + - name: Cypress run uses: cypress-io/github-action@v6 with: browser: chrome component: true - spec: packages/main/src/components + spec: packages/${{ matrix.spec }} install: false - uses: coverallsapp/github-action@v2.3.6 + if: ${{ inputs.reportCoverage && matrix.react == '19' }} with: - github-token: ${{ secrets.GITHUB_TOKEN }} file: temp/cypress-coverage/lcov.info + github-token: ${{ secrets.GITHUB_TOKEN }} + parallel: true + flag-name: ${{ matrix.spec }} + + coveralls: + if: ${{ always() && inputs.reportCoverage }} + needs: ['cypress'] + name: 'Combine Coverage' + runs-on: ubuntu-latest + steps: + - name: Coveralls + uses: coverallsapp/github-action@v2.3.6 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + parallel-finished: true + carryforward: 'base,charts,cypress-commands,main/src/components,main/src/internal,compat' From b87154d998711d575f9d3ca00efa4bc7cf305a72 Mon Sep 17 00:00:00 2001 From: Lukas Harbarth Date: Wed, 12 Feb 2025 15:42:06 +0100 Subject: [PATCH 11/11] Update test.yml --- .github/workflows/test.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3635c1892c5..7e8f2ee5499 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -49,13 +49,19 @@ jobs: spec: packages/${{ matrix.spec }} install: false + - uses: actions/github-script@v7 + id: transform-path + with: + script: return "${{ matrix.spec }}".replaceAll("/", "-") + result-encoding: string + - uses: coverallsapp/github-action@v2.3.6 if: ${{ inputs.reportCoverage && matrix.react == '19' }} with: file: temp/cypress-coverage/lcov.info github-token: ${{ secrets.GITHUB_TOKEN }} parallel: true - flag-name: ${{ matrix.spec }} + flag-name: ${{ steps.transform-path.outputs.result }} coveralls: if: ${{ always() && inputs.reportCoverage }} @@ -68,4 +74,4 @@ jobs: with: github-token: ${{ secrets.GITHUB_TOKEN }} parallel-finished: true - carryforward: 'base,charts,cypress-commands,main/src/components,main/src/internal,compat' + carryforward: 'base,charts,cypress-commands,main-src-components,main-src-internal,compat'