From 5fb7705153d47c99218f05b8a21e84aa2cab9d8c Mon Sep 17 00:00:00 2001 From: undsoft Date: Thu, 28 Nov 2024 17:04:09 +0100 Subject: [PATCH 1/5] NAS-132650: Fixing codecov coverage reporting --- .github/workflows/main.yml | 10 +++------- package.json | 1 - src/app/pages/shell/shell.component.ts | 5 +++++ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 55322b64697..47e3ef4ced3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -90,22 +90,18 @@ jobs: env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} steps: - - name: Collect coverage from shards + - name: Collect coverage and test data from shards uses: actions/download-artifact@v4 with: pattern: 'coverage-*' path: coverage merge-multiple: true - - name: Collect test data from shards - uses: actions/download-artifact@v4 - with: - pattern: 'junit-*' - path: coverage - merge-multiple: true - name: Merge Code Coverage run: npx -y nyc merge coverage/ coverage/merged-coverage.json - name: Merge Test Data run: npx -y junit-report-merger coverage/merged-junit.xml "coverage/junit-*.xml" + - name: Remove shard data + run: rm -rf coverage/coverage-*.json coverage/junit-*.xml - name: Upload coverage to Codecov uses: codecov/codecov-action@v4 with: diff --git a/package.json b/package.json index 2406eb5ef4d..2056e526cf6 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,6 @@ "strict-null-checks": "node_modules/typescript/bin/tsc --project tsconfig.strictNullChecks.json", "test": "jest", "test:changed": "node scripts/test_changed.js", - "test:ci": "jest --runInBand", "test:pr": "yarn run check-env && echo 'Setting up temporary environment file...\\n' && yarn run ui remote -i 'headless.local' && jest --coverage --maxWorkers=2", "test:watch": "jest --watch", "ui": "cd $(git rev-parse --show-toplevel) && tsx ./scripts/ui/ui.ts", diff --git a/src/app/pages/shell/shell.component.ts b/src/app/pages/shell/shell.component.ts index ff889efe650..6de835b7992 100644 --- a/src/app/pages/shell/shell.component.ts +++ b/src/app/pages/shell/shell.component.ts @@ -18,4 +18,9 @@ export class ShellComponent implements TerminalConfiguration { get conf(): typeof this { return this; } + + someDummyChange(): void { + const dummy = 'dummy'; + console.warn(dummy); + } } From 48988dddd11c22fa9b2572bc84410f5ac3c3aecf Mon Sep 17 00:00:00 2001 From: undsoft Date: Thu, 28 Nov 2024 18:16:34 +0100 Subject: [PATCH 2/5] NAS-132650: Fixing codecov coverage reporting --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 47e3ef4ced3..0541b3ae4ff 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -103,11 +103,11 @@ jobs: - name: Remove shard data run: rm -rf coverage/coverage-*.json coverage/junit-*.xml - name: Upload coverage to Codecov - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: name: webui token: ${{ env.CODECOV_TOKEN }} - file: coverage/merged-coverage.json + files: coverage/merged-coverage.json fail_ci_if_error: true - name: Upload extra test data to Codecov if: ${{ !cancelled() }} From 4c8babc942bcd73e30127bc270094596f7ecfe68 Mon Sep 17 00:00:00 2001 From: undsoft Date: Fri, 29 Nov 2024 09:09:19 +0100 Subject: [PATCH 3/5] NAS-132650: Fixing codecov coverage reporting --- .github/workflows/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0541b3ae4ff..6ab1b9a533e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -90,6 +90,10 @@ jobs: env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Install + uses: ./.github/actions/prepare - name: Collect coverage and test data from shards uses: actions/download-artifact@v4 with: From 120e02fe9f73a08e4e37d3f28e3e0ad2a54b477c Mon Sep 17 00:00:00 2001 From: undsoft Date: Fri, 29 Nov 2024 10:37:17 +0100 Subject: [PATCH 4/5] NAS-132650: Fixing codecov coverage reporting --- .github/workflows/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6ab1b9a533e..f76e136eff1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -92,8 +92,6 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Install - uses: ./.github/actions/prepare - name: Collect coverage and test data from shards uses: actions/download-artifact@v4 with: From 72609bc32ad3b40aa6c4c3c5eb4c4364e029fc26 Mon Sep 17 00:00:00 2001 From: undsoft Date: Fri, 29 Nov 2024 11:10:27 +0100 Subject: [PATCH 5/5] NAS-132650: Fixing codecov coverage reporting --- src/app/pages/shell/shell.component.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/app/pages/shell/shell.component.ts b/src/app/pages/shell/shell.component.ts index 6de835b7992..ff889efe650 100644 --- a/src/app/pages/shell/shell.component.ts +++ b/src/app/pages/shell/shell.component.ts @@ -18,9 +18,4 @@ export class ShellComponent implements TerminalConfiguration { get conf(): typeof this { return this; } - - someDummyChange(): void { - const dummy = 'dummy'; - console.warn(dummy); - } }