From 831287178967dce993a8689c566bbb0d8094a290 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 17 Sep 2023 00:55:20 +0530 Subject: [PATCH 1/3] chore(deps)(deps-dev): bump interface-datastore from 7.0.4 to 8.2.5 (#1575) Bumps [interface-datastore](https://github.com/ipfs/js-stores) from 7.0.4 to 8.2.5. - [Release notes](https://github.com/ipfs/js-stores/releases) - [Commits](https://github.com/ipfs/js-stores/compare/interface-datastore-v7.0.4...interface-datastore-v8.2.5) --- updated-dependencies: - dependency-name: interface-datastore dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 80 +++++-------------------------------- packages/sdk/package.json | 2 +- packages/tests/package.json | 2 +- 3 files changed, 12 insertions(+), 72 deletions(-) diff --git a/package-lock.json b/package-lock.json index b8f7a28700..15efcfe886 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12331,16 +12331,13 @@ "license": "ISC" }, "node_modules/interface-datastore": { - "version": "8.2.4", - "license": "Apache-2.0 OR MIT", + "version": "8.2.5", + "resolved": "https://registry.npmjs.org/interface-datastore/-/interface-datastore-8.2.5.tgz", + "integrity": "sha512-kvLGJMz3RPoJF/g5DbEvfWWempIiSBLVMf63b0PBsziVcSkj0ofzHYI86v8vqpGedkQ81DtPCUKyvX9W7zWvrQ==", "dependencies": { "interface-store": "^5.0.0", "nanoid": "^4.0.0", "uint8arrays": "^4.0.2" - }, - "engines": { - "node": ">=16.0.0", - "npm": ">=7.0.0" } }, "node_modules/interface-datastore/node_modules/nanoid": { @@ -27333,7 +27330,7 @@ "@rollup/plugin-node-resolve": "^15.1.0", "@waku/build-utils": "*", "cspell": "^7.3.2", - "interface-datastore": "^7.0.4", + "interface-datastore": "^8.2.5", "npm-run-all": "^4.1.5", "rollup": "^3.29.0", "typescript": "^5.0.4" @@ -27342,46 +27339,6 @@ "node": ">=16" } }, - "packages/sdk/node_modules/interface-datastore": { - "version": "7.0.4", - "dev": true, - "license": "Apache-2.0 OR MIT", - "dependencies": { - "interface-store": "^3.0.0", - "nanoid": "^4.0.0", - "uint8arrays": "^4.0.2" - }, - "engines": { - "node": ">=16.0.0", - "npm": ">=7.0.0" - } - }, - "packages/sdk/node_modules/interface-store": { - "version": "3.0.4", - "dev": true, - "license": "Apache-2.0 OR MIT", - "engines": { - "node": ">=16.0.0", - "npm": ">=7.0.0" - } - }, - "packages/sdk/node_modules/nanoid": { - "version": "4.0.2", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "bin": { - "nanoid": "bin/nanoid.js" - }, - "engines": { - "node": "^14 || ^16 || >=18" - } - }, "packages/tests": { "name": "@waku/tests", "version": "0.0.1", @@ -27420,7 +27377,7 @@ "cspell": "^7.3.2", "datastore-core": "^9.2.2", "debug": "^4.3.4", - "interface-datastore": "^8.2.3", + "interface-datastore": "^8.2.5", "libp2p": "^0.46.9", "mocha": "^10.2.0", "npm-run-all": "^4.1.5", @@ -31452,30 +31409,11 @@ "@waku/relay": "0.0.6", "@waku/utils": "0.0.11", "cspell": "^7.3.2", - "interface-datastore": "^7.0.4", + "interface-datastore": "^8.2.5", "libp2p": "^0.46.9", "npm-run-all": "^4.1.5", "rollup": "^3.29.0", "typescript": "^5.0.4" - }, - "dependencies": { - "interface-datastore": { - "version": "7.0.4", - "dev": true, - "requires": { - "interface-store": "^3.0.0", - "nanoid": "^4.0.0", - "uint8arrays": "^4.0.2" - } - }, - "interface-store": { - "version": "3.0.4", - "dev": true - }, - "nanoid": { - "version": "4.0.2", - "dev": true - } } }, "@waku/tests": { @@ -31506,7 +31444,7 @@ "datastore-core": "^9.2.2", "debug": "^4.3.4", "dockerode": "^3.3.5", - "interface-datastore": "^8.2.3", + "interface-datastore": "^8.2.5", "libp2p": "^0.46.9", "mocha": "^10.2.0", "npm-run-all": "^4.1.5", @@ -35767,7 +35705,9 @@ "version": "1.3.8" }, "interface-datastore": { - "version": "8.2.4", + "version": "8.2.5", + "resolved": "https://registry.npmjs.org/interface-datastore/-/interface-datastore-8.2.5.tgz", + "integrity": "sha512-kvLGJMz3RPoJF/g5DbEvfWWempIiSBLVMf63b0PBsziVcSkj0ofzHYI86v8vqpGedkQ81DtPCUKyvX9W7zWvrQ==", "requires": { "interface-store": "^5.0.0", "nanoid": "^4.0.0", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index e79565ff91..4e140edc90 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -66,7 +66,7 @@ "@rollup/plugin-node-resolve": "^15.1.0", "@waku/build-utils": "*", "cspell": "^7.3.2", - "interface-datastore": "^7.0.4", + "interface-datastore": "^8.2.5", "npm-run-all": "^4.1.5", "rollup": "^3.29.0", "typescript": "^5.0.4" diff --git a/packages/tests/package.json b/packages/tests/package.json index 269af9f644..bbcf1f2d58 100644 --- a/packages/tests/package.json +++ b/packages/tests/package.json @@ -83,7 +83,7 @@ "cspell": "^7.3.2", "datastore-core": "^9.2.2", "debug": "^4.3.4", - "interface-datastore": "^8.2.3", + "interface-datastore": "^8.2.5", "libp2p": "^0.46.9", "mocha": "^10.2.0", "npm-run-all": "^4.1.5", From bb4fdaa2482459248a7be63efd8f2a6c635e7703 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Sep 2023 13:04:11 +0530 Subject: [PATCH 2/3] chore(deps)(deps-dev): bump datastore-core from 9.2.2 to 9.2.3 (#1574) Bumps [datastore-core](https://github.com/ipfs/js-stores) from 9.2.2 to 9.2.3. - [Release notes](https://github.com/ipfs/js-stores/releases) - [Commits](https://github.com/ipfs/js-stores/compare/datastore-core-v9.2.2...datastore-core-v9.2.3) --- updated-dependencies: - dependency-name: datastore-core dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Danish Arora <35004822+danisharora099@users.noreply.github.com> --- package-lock.json | 21 ++++++++++----------- packages/tests/package.json | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 15efcfe886..734a4cee66 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8507,8 +8507,9 @@ } }, "node_modules/datastore-core": { - "version": "9.2.2", - "license": "Apache-2.0 OR MIT", + "version": "9.2.3", + "resolved": "https://registry.npmjs.org/datastore-core/-/datastore-core-9.2.3.tgz", + "integrity": "sha512-jcvrVDt+jp7lUp2WhMXXgX/hoi3VcJebN+z/ZXbIRKOVfNOF4bl8cvr7sQ1y9qITikgC2coXFYd79Wzt/n13ZQ==", "dependencies": { "@libp2p/logger": "^3.0.0", "err-code": "^3.0.1", @@ -8517,16 +8518,12 @@ "it-drain": "^3.0.1", "it-filter": "^3.0.0", "it-map": "^3.0.1", - "it-merge": "^3.0.0", + "it-merge": "^3.0.1", "it-pipe": "^3.0.0", "it-pushable": "^3.0.0", "it-sort": "^3.0.1", "it-take": "^3.0.1", "uint8arrays": "^4.0.2" - }, - "engines": { - "node": ">=16.0.0", - "npm": ">=7.0.0" } }, "node_modules/datastore-core/node_modules/@libp2p/logger": { @@ -27375,7 +27372,7 @@ "@waku/sdk": "*", "chai": "^4.3.7", "cspell": "^7.3.2", - "datastore-core": "^9.2.2", + "datastore-core": "^9.2.3", "debug": "^4.3.4", "interface-datastore": "^8.2.5", "libp2p": "^0.46.9", @@ -31441,7 +31438,7 @@ "chai": "^4.3.7", "chai-as-promised": "^7.1.1", "cspell": "^7.3.2", - "datastore-core": "^9.2.2", + "datastore-core": "^9.2.3", "debug": "^4.3.4", "dockerode": "^3.3.5", "interface-datastore": "^8.2.5", @@ -33471,7 +33468,9 @@ "dev": true }, "datastore-core": { - "version": "9.2.2", + "version": "9.2.3", + "resolved": "https://registry.npmjs.org/datastore-core/-/datastore-core-9.2.3.tgz", + "integrity": "sha512-jcvrVDt+jp7lUp2WhMXXgX/hoi3VcJebN+z/ZXbIRKOVfNOF4bl8cvr7sQ1y9qITikgC2coXFYd79Wzt/n13ZQ==", "requires": { "@libp2p/logger": "^3.0.0", "err-code": "^3.0.1", @@ -33480,7 +33479,7 @@ "it-drain": "^3.0.1", "it-filter": "^3.0.0", "it-map": "^3.0.1", - "it-merge": "^3.0.0", + "it-merge": "^3.0.1", "it-pipe": "^3.0.0", "it-pushable": "^3.0.0", "it-sort": "^3.0.1", diff --git a/packages/tests/package.json b/packages/tests/package.json index bbcf1f2d58..aa716aa2f1 100644 --- a/packages/tests/package.json +++ b/packages/tests/package.json @@ -81,7 +81,7 @@ "@waku/sdk": "*", "chai": "^4.3.7", "cspell": "^7.3.2", - "datastore-core": "^9.2.2", + "datastore-core": "^9.2.3", "debug": "^4.3.4", "interface-datastore": "^8.2.5", "libp2p": "^0.46.9", From aae1d9f68b805bddcd3ab1c1c2379635957c5c8e Mon Sep 17 00:00:00 2001 From: fbarbu15 Date: Mon, 18 Sep 2023 12:48:47 +0300 Subject: [PATCH 3/3] chore: move the failed retries on test level (#1573) Co-authored-by: Sasha <118575614+weboko@users.noreply.github.com> --- .github/workflows/ci.yml | 37 ++++++++++++------------------------ packages/tests/.mocharc.json | 3 ++- 2 files changed, 14 insertions(+), 26 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 093fa7353c..6e96809fc0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,6 @@ on: env: NODE_JS: "18" - RETRY_ATTEMPTS: 3 jobs: check: @@ -96,12 +95,9 @@ jobs: - run: npm run build:esm - - uses: Wandalen/wretry.action@master - with: - attempt_limit: ${{ env.RETRY_ATTEMPTS }} - command: npm run test:node - with: | - DEBUG: "" + - run: npm run test:node + env: + DEBUG: "" - name: Upload debug logs on failure uses: actions/upload-artifact@v3 @@ -135,12 +131,9 @@ jobs: - run: npm run build:esm - - uses: Wandalen/wretry.action@master - with: - attempt_limit: ${{ env.RETRY_ATTEMPTS }} - command: npm run test:optional --workspace=@waku/tests - with: | - DEBUG: "" + - run: npm run test:optional --workspace=@waku/tests + env: + DEBUG: "" node_with_go_waku_master: runs-on: ubuntu-latest @@ -163,12 +156,9 @@ jobs: - run: npm run build:esm - - uses: Wandalen/wretry.action@master - with: - attempt_limit: ${{ env.RETRY_ATTEMPTS }} - command: npm run test:node - with: | - DEBUG: "waku:nwaku*,waku:test*" + - run: npm run test:node + env: + DEBUG: "waku:nwaku*,waku:test*" - name: Upload debug logs on failure uses: actions/upload-artifact@v3 @@ -203,12 +193,9 @@ jobs: - run: npm run build:esm - - uses: Wandalen/wretry.action@master - with: - attempt_limit: ${{ env.RETRY_ATTEMPTS }} - command: npm run test:node - with: | - DEBUG: "waku:nwaku*,waku:test*" + - run: npm run test:node + env: + DEBUG: "waku:nwaku*,waku:test*" - name: Upload debug logs on failure uses: actions/upload-artifact@v3 diff --git a/packages/tests/.mocharc.json b/packages/tests/.mocharc.json index ede1672e52..e277cf89b1 100644 --- a/packages/tests/.mocharc.json +++ b/packages/tests/.mocharc.json @@ -6,5 +6,6 @@ "experimental-specifier-resolution=node", "loader=ts-node/esm" ], - "exit": true + "exit": true, + "retries": 3 }