Skip to content

Commit

Permalink
Merge branch 'master' into fix--explicit-nwaku-subscriptions-in-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
SionoiS authored Sep 18, 2023
2 parents 619dab4 + aae1d9f commit e6c6f80
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 110 deletions.
37 changes: 12 additions & 25 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ on:

env:
NODE_JS: "18"
RETRY_ATTEMPTS: 3

jobs:
check:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
101 changes: 20 additions & 81 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion packages/tests/.mocharc.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
"experimental-specifier-resolution=node",
"loader=ts-node/esm"
],
"exit": true
"exit": true,
"retries": 3
}
4 changes: 2 additions & 2 deletions packages/tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@
"@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.3",
"interface-datastore": "^8.2.5",
"libp2p": "^0.46.9",
"mocha": "^10.2.0",
"npm-run-all": "^4.1.5",
Expand Down

0 comments on commit e6c6f80

Please sign in to comment.