From 57cd3313c6bd040ff671efc5400c1ccfac337a22 Mon Sep 17 00:00:00 2001 From: Shinigami92 Date: Fri, 4 Feb 2022 22:58:53 +0100 Subject: [PATCH 1/7] ci: use codecov default --- .github/.codecov.yml | 6 ------ .vscode/extensions.json | 3 +-- .vscode/settings.json | 4 ---- 3 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 .github/.codecov.yml diff --git a/.github/.codecov.yml b/.github/.codecov.yml deleted file mode 100644 index 3c471565a10..00000000000 --- a/.github/.codecov.yml +++ /dev/null @@ -1,6 +0,0 @@ -comment: - layout: 'diff, flags, files' - behavior: default - require_changes: false - require_base: false - require_head: true diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 965297c1ec5..17fab0c02b3 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -2,7 +2,6 @@ "recommendations": [ "dbaeumer.vscode-eslint", "editorconfig.editorconfig", - "esbenp.prettier-vscode", - "redhat.vscode-yaml" + "esbenp.prettier-vscode" ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index adff015ab05..a2caeede2ca 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,9 +7,5 @@ "files.associations": { "*.json5": "jsonc" - }, - - "yaml.schemas": { - "https://json.schemastore.org/codecov.json": ".github/.codecov.yml" } } From cae3fbef52a3fb1d20a4a382903841f0cdb29cd4 Mon Sep 17 00:00:00 2001 From: Shinigami92 Date: Fri, 4 Feb 2022 23:06:55 +0100 Subject: [PATCH 2/7] ci: set codecov token explicitly --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 57b725aa349..b07c7d0dfa3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -130,5 +130,6 @@ jobs: - name: Upload coverage to Codecov uses: codecov/codecov-action@v2.1.0 with: + token: ${{ secrets.CODECOV_TOKEN }} directory: ./coverage fail_ci_if_error: true From e1c1dc9cc4cb2f32450c00e9ec3eab6019bac683 Mon Sep 17 00:00:00 2001 From: Shinigami92 Date: Fri, 4 Feb 2022 23:08:12 +0100 Subject: [PATCH 3/7] ci: set verbose: true --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b07c7d0dfa3..e66f054c692 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -133,3 +133,4 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} directory: ./coverage fail_ci_if_error: true + verbose: true From 2cecd13d366fd69be16ce75873eb5cfa57ee045e Mon Sep 17 00:00:00 2001 From: Shinigami92 Date: Fri, 4 Feb 2022 23:20:57 +0100 Subject: [PATCH 4/7] ci: log clover file --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e66f054c692..934be3aafa5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -127,6 +127,9 @@ jobs: - name: Generate coverage report run: pnpm vitest run --coverage + - name: Log clover.xml + run: cat coverage/clover.xml + - name: Upload coverage to Codecov uses: codecov/codecov-action@v2.1.0 with: From bcca77201ef36f1862593193ca85e9e65f62fd40 Mon Sep 17 00:00:00 2001 From: Shinigami92 Date: Fri, 4 Feb 2022 23:28:41 +0100 Subject: [PATCH 5/7] chore: remove include --- vite.config.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/vite.config.ts b/vite.config.ts index 13e82b4d03e..87842c52d31 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -7,8 +7,6 @@ export default defineConfig({ coverage: { all: true, reporter: ['clover', 'cobertura', 'lcov', 'text'], - // TODO christopher 2022-02-04: Later we want to test `src` instead of `dist/cjs` - include: ['dist/cjs'], }, }, }); From f0759c9b37169e655c542b5eda32995bb2ded8e9 Mon Sep 17 00:00:00 2001 From: Shinigami92 Date: Fri, 4 Feb 2022 23:40:14 +0100 Subject: [PATCH 6/7] ci: try something else --- .github/workflows/ci.yml | 5 ----- vite.config.ts | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 934be3aafa5..15af72df19a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -127,13 +127,8 @@ jobs: - name: Generate coverage report run: pnpm vitest run --coverage - - name: Log clover.xml - run: cat coverage/clover.xml - - name: Upload coverage to Codecov uses: codecov/codecov-action@v2.1.0 with: token: ${{ secrets.CODECOV_TOKEN }} - directory: ./coverage fail_ci_if_error: true - verbose: true diff --git a/vite.config.ts b/vite.config.ts index 87842c52d31..756dbbd5738 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -6,7 +6,8 @@ export default defineConfig({ test: { coverage: { all: true, - reporter: ['clover', 'cobertura', 'lcov', 'text'], + reporter: ['lcov'], + include: ['dist/cjs'], }, }, }); From 03894849c1a884579ec1f91530a7e4ae06cc38d5 Mon Sep 17 00:00:00 2001 From: Shinigami92 Date: Fri, 4 Feb 2022 23:47:32 +0100 Subject: [PATCH 7/7] ci: try something else --- .github/.codecov.yml | 6 ++++++ .vscode/extensions.json | 3 ++- .vscode/settings.json | 4 ++++ vite.config.ts | 5 +++-- 4 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 .github/.codecov.yml diff --git a/.github/.codecov.yml b/.github/.codecov.yml new file mode 100644 index 00000000000..3c471565a10 --- /dev/null +++ b/.github/.codecov.yml @@ -0,0 +1,6 @@ +comment: + layout: 'diff, flags, files' + behavior: default + require_changes: false + require_base: false + require_head: true diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 17fab0c02b3..965297c1ec5 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -2,6 +2,7 @@ "recommendations": [ "dbaeumer.vscode-eslint", "editorconfig.editorconfig", - "esbenp.prettier-vscode" + "esbenp.prettier-vscode", + "redhat.vscode-yaml" ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index a2caeede2ca..adff015ab05 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,5 +7,9 @@ "files.associations": { "*.json5": "jsonc" + }, + + "yaml.schemas": { + "https://json.schemastore.org/codecov.json": ".github/.codecov.yml" } } diff --git a/vite.config.ts b/vite.config.ts index 756dbbd5738..a83a6374158 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -6,8 +6,9 @@ export default defineConfig({ test: { coverage: { all: true, - reporter: ['lcov'], - include: ['dist/cjs'], + reporter: ['clover', 'cobertura', 'lcov', 'text'], + // TODO christopher 2022-02-04: Later we will only cover `src` instead of `dist` and `src` + include: ['dist', 'src'], }, }, });