From 79b384a3c226794aa94354435d7fc7184d61a951 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Mon, 20 Feb 2023 17:29:49 +0000 Subject: [PATCH 1/4] fix: re-enable test coverage c8 has been released recently as has node so re-enable test coverage --- src/cmds/test.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/cmds/test.js b/src/cmds/test.js index 3106ab2db..15457ba57 100644 --- a/src/cmds/test.js +++ b/src/cmds/test.js @@ -107,12 +107,6 @@ export default { * @param {any} argv */ async handler (argv) { - // temporarily disable code coverage on node 18 - if (argv.cov && process.version.startsWith('v18.')) { - console.warn(kleur.red('!!! Temporarily disabling code coverage\n')) // eslint-disable-line no-console - delete argv.cov - } - await testCmd.run({ ...argv, bundle: false From cbe463bf7108ac1528c682c1e4aa0af81328b342 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Sat, 10 Jun 2023 08:14:24 +0200 Subject: [PATCH 2/4] test: test on lts and current --- .github/workflows/js-test-and-release.yml | 6 +++--- src/cmds/test.js | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/js-test-and-release.yml b/.github/workflows/js-test-and-release.yml index 546f6d4a3..62e276488 100644 --- a/.github/workflows/js-test-and-release.yml +++ b/.github/workflows/js-test-and-release.yml @@ -27,7 +27,7 @@ jobs: strategy: matrix: os: [windows-latest, ubuntu-latest, macos-latest] - node: [lts/*] + node: [lts/*, current] fail-fast: true steps: - uses: actions/checkout@v3 @@ -102,7 +102,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] - node: [lts/*] + node: [lts/*, current] fail-fast: true steps: - uses: actions/checkout@v3 @@ -121,7 +121,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] - node: [lts/*] + node: [lts/*, current] fail-fast: true steps: - uses: actions/checkout@v3 diff --git a/src/cmds/test.js b/src/cmds/test.js index 15457ba57..d1933d787 100644 --- a/src/cmds/test.js +++ b/src/cmds/test.js @@ -107,6 +107,12 @@ export default { * @param {any} argv */ async handler (argv) { + // temporarily disable code coverage on node 18 + if (argv.cov && process.version.startsWith('v18.')) { + console.warn(kleur.red('!!! Temporarily disabling code coverage - https://github.com/ipfs/aegir/issues/1206\n')) // eslint-disable-line no-console + delete argv.cov + } + await testCmd.run({ ...argv, bundle: false From 3c37832add9fc4b3fd702d3b740a691af455f59f Mon Sep 17 00:00:00 2001 From: achingbrain Date: Thu, 15 Jun 2023 19:14:49 +0200 Subject: [PATCH 3/4] chore: update c8 --- package.json | 2 +- src/cmds/test.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 48a2ef017..d56a3e364 100644 --- a/package.json +++ b/package.json @@ -243,7 +243,7 @@ "@typescript-eslint/eslint-plugin": "^5.18.0", "buffer": "^6.0.3", "bytes": "^3.1.0", - "c8": "^7.7.0", + "c8": "^8.0.0", "chai": "^4.3.4", "chai-as-promised": "^7.1.1", "chai-bites": "^0.1.2", diff --git a/src/cmds/test.js b/src/cmds/test.js index d1933d787..d882655ad 100644 --- a/src/cmds/test.js +++ b/src/cmds/test.js @@ -107,8 +107,8 @@ export default { * @param {any} argv */ async handler (argv) { - // temporarily disable code coverage on node 18 - if (argv.cov && process.version.startsWith('v18.')) { + // temporarily disable code coverage on node targets running node 18 + if (argv.cov && process.version.startsWith('v18.') && argv.target === 'node') { console.warn(kleur.red('!!! Temporarily disabling code coverage - https://github.com/ipfs/aegir/issues/1206\n')) // eslint-disable-line no-console delete argv.cov } From 70369dc827dcc458bfb1b0748cbe444992d8a90e Mon Sep 17 00:00:00 2001 From: Alex Potsides Date: Tue, 24 Oct 2023 06:24:47 +0100 Subject: [PATCH 4/4] Apply suggestions from code review --- .github/workflows/js-test-and-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/js-test-and-release.yml b/.github/workflows/js-test-and-release.yml index c5804a1ef..2c7a14bb9 100644 --- a/.github/workflows/js-test-and-release.yml +++ b/.github/workflows/js-test-and-release.yml @@ -22,4 +22,4 @@ jobs: DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }} DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - UCI_GITHUB_TOKEN: ${{ secrets.UCI_GITHUB_TOKEN }} \ No newline at end of file + UCI_GITHUB_TOKEN: ${{ secrets.UCI_GITHUB_TOKEN }}