From ed0ebae70729b8ebd0063b618a8e12a122eb2134 Mon Sep 17 00:00:00 2001 From: chad Date: Tue, 10 Oct 2023 16:47:18 -0500 Subject: [PATCH 1/5] deps: use TS multiformats (#2152) --- examples/peer-and-content-routing/package.json | 2 +- packages/crypto/package.json | 2 +- packages/interface/package.json | 2 +- packages/kad-dht/package.json | 2 +- packages/keychain/package.json | 2 +- packages/libp2p/package.json | 2 +- packages/logger/package.json | 2 +- packages/peer-id-factory/package.json | 2 +- packages/peer-id/package.json | 2 +- packages/peer-store/package.json | 2 +- packages/pubsub-floodsub/package.json | 2 +- packages/pubsub/package.json | 2 +- packages/transport-webrtc/package.json | 2 +- packages/transport-webtransport/package.json | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/examples/peer-and-content-routing/package.json b/examples/peer-and-content-routing/package.json index 0218be3139..71c445f0d7 100644 --- a/examples/peer-and-content-routing/package.json +++ b/examples/peer-and-content-routing/package.json @@ -38,7 +38,7 @@ "delay": "^6.0.0", "it-all": "^3.0.2", "libp2p": "^0.46.0", - "multiformats": "^12.0.1" + "multiformats": "github:multiformats/js-multiformats#feat/typescript" }, "devDependencies": { "aegir": "^41.0.2", diff --git a/packages/crypto/package.json b/packages/crypto/package.json index 785f3f720d..0d0cd51e13 100644 --- a/packages/crypto/package.json +++ b/packages/crypto/package.json @@ -89,7 +89,7 @@ "@libp2p/interface": "^0.1.3", "@noble/curves": "^1.1.0", "@noble/hashes": "^1.3.1", - "multiformats": "^12.0.1", + "multiformats": "github:multiformats/js-multiformats#feat/typescript", "node-forge": "^1.1.0", "protons-runtime": "^5.0.0", "uint8arraylist": "^2.4.3", diff --git a/packages/interface/package.json b/packages/interface/package.json index 25e4b96c14..abfebf68fd 100644 --- a/packages/interface/package.json +++ b/packages/interface/package.json @@ -162,7 +162,7 @@ "abortable-iterator": "^5.0.1", "it-pushable": "^3.2.0", "it-stream-types": "^2.0.1", - "multiformats": "^12.0.1", + "multiformats": "github:multiformats/js-multiformats#feat/typescript", "p-defer": "^4.0.0", "race-signal": "^1.0.0", "uint8arraylist": "^2.4.3" diff --git a/packages/kad-dht/package.json b/packages/kad-dht/package.json index 4a215a7bfc..153ab039e9 100644 --- a/packages/kad-dht/package.json +++ b/packages/kad-dht/package.json @@ -77,7 +77,7 @@ "it-pipe": "^3.0.1", "it-stream-types": "^2.0.1", "it-take": "^3.0.1", - "multiformats": "^12.0.1", + "multiformats": "github:multiformats/js-multiformats#feat/typescript", "p-defer": "^4.0.0", "p-event": "^6.0.0", "p-queue": "^7.3.4", diff --git a/packages/keychain/package.json b/packages/keychain/package.json index 0ac5a359f4..495cb99461 100644 --- a/packages/keychain/package.json +++ b/packages/keychain/package.json @@ -67,6 +67,6 @@ "@libp2p/peer-id-factory": "^3.0.5", "aegir": "^41.0.2", "datastore-core": "^9.1.1", - "multiformats": "^12.0.1" + "multiformats": "github:multiformats/js-multiformats#feat/typescript" } } diff --git a/packages/libp2p/package.json b/packages/libp2p/package.json index 14ec1b4da7..93ad0f9082 100644 --- a/packages/libp2p/package.json +++ b/packages/libp2p/package.json @@ -155,7 +155,7 @@ "it-protobuf-stream": "^1.0.0", "it-stream-types": "^2.0.1", "merge-options": "^3.0.4", - "multiformats": "^12.0.1", + "multiformats": "github:multiformats/js-multiformats#feat/typescript", "p-defer": "^4.0.0", "p-queue": "^7.3.4", "p-retry": "^6.0.0", diff --git a/packages/logger/package.json b/packages/logger/package.json index 38babeb080..472c6859d4 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -53,7 +53,7 @@ "@multiformats/multiaddr": "^12.1.5", "debug": "^4.3.4", "interface-datastore": "^8.2.0", - "multiformats": "^12.0.1" + "multiformats": "github:multiformats/js-multiformats#feat/typescript" }, "devDependencies": { "@libp2p/peer-id": "^3.0.3", diff --git a/packages/peer-id-factory/package.json b/packages/peer-id-factory/package.json index d2ca5bdb2f..4d58f576d7 100644 --- a/packages/peer-id-factory/package.json +++ b/packages/peer-id-factory/package.json @@ -56,7 +56,7 @@ "@libp2p/crypto": "^2.0.5", "@libp2p/interface": "^0.1.3", "@libp2p/peer-id": "^3.0.3", - "multiformats": "^12.0.1", + "multiformats": "github:multiformats/js-multiformats#feat/typescript", "protons-runtime": "^5.0.0", "uint8arraylist": "^2.4.3", "uint8arrays": "^4.0.6" diff --git a/packages/peer-id/package.json b/packages/peer-id/package.json index bb910d9888..425a3d50b7 100644 --- a/packages/peer-id/package.json +++ b/packages/peer-id/package.json @@ -50,7 +50,7 @@ }, "dependencies": { "@libp2p/interface": "^0.1.3", - "multiformats": "^12.0.1", + "multiformats": "github:multiformats/js-multiformats#feat/typescript", "uint8arrays": "^4.0.6" }, "devDependencies": { diff --git a/packages/peer-store/package.json b/packages/peer-store/package.json index 74350542c4..f7ad78f7d0 100644 --- a/packages/peer-store/package.json +++ b/packages/peer-store/package.json @@ -64,7 +64,7 @@ "interface-datastore": "^8.2.0", "it-all": "^3.0.2", "mortice": "^3.0.1", - "multiformats": "^12.0.1", + "multiformats": "github:multiformats/js-multiformats#feat/typescript", "protons-runtime": "^5.0.0", "uint8arraylist": "^2.4.3", "uint8arrays": "^4.0.6" diff --git a/packages/pubsub-floodsub/package.json b/packages/pubsub-floodsub/package.json index 0099535d9b..a6a831f27d 100644 --- a/packages/pubsub-floodsub/package.json +++ b/packages/pubsub-floodsub/package.json @@ -69,7 +69,7 @@ "@multiformats/multiaddr": "^12.1.3", "@types/sinon": "^10.0.15", "aegir": "^41.0.2", - "multiformats": "^12.0.1", + "multiformats": "github:multiformats/js-multiformats#feat/typescript", "p-wait-for": "^5.0.2", "protons": "^7.0.2", "sinon": "^16.0.0" diff --git a/packages/pubsub/package.json b/packages/pubsub/package.json index baf14e94f9..3edc022238 100644 --- a/packages/pubsub/package.json +++ b/packages/pubsub/package.json @@ -89,7 +89,7 @@ "it-length-prefixed": "^9.0.1", "it-pipe": "^3.0.1", "it-pushable": "^3.2.0", - "multiformats": "^12.0.1", + "multiformats": "github:multiformats/js-multiformats#feat/typescript", "p-queue": "^7.3.4", "uint8arraylist": "^2.4.3", "uint8arrays": "^4.0.6" diff --git a/packages/transport-webrtc/package.json b/packages/transport-webrtc/package.json index 21254dbdea..9375b45805 100644 --- a/packages/transport-webrtc/package.json +++ b/packages/transport-webrtc/package.json @@ -62,7 +62,7 @@ "it-pushable": "^3.2.0", "it-stream-types": "^2.0.1", "it-to-buffer": "^4.0.2", - "multiformats": "^12.0.1", + "multiformats": "github:multiformats/js-multiformats#feat/typescript", "multihashes": "^4.0.3", "node-datachannel": "^0.5.0-dev", "p-defer": "^4.0.0", diff --git a/packages/transport-webtransport/package.json b/packages/transport-webtransport/package.json index e0442f0712..66c5a028da 100644 --- a/packages/transport-webtransport/package.json +++ b/packages/transport-webtransport/package.json @@ -68,7 +68,7 @@ "@multiformats/multiaddr": "^12.1.5", "@multiformats/multiaddr-matcher": "^1.0.1", "it-stream-types": "^2.0.1", - "multiformats": "^12.0.1", + "multiformats": "github:multiformats/js-multiformats#feat/typescript", "uint8arraylist": "^2.4.3", "uint8arrays": "^4.0.6" }, From e009b115cfa62344c0a15ff2ab53bfd72149e179 Mon Sep 17 00:00:00 2001 From: chad Date: Thu, 12 Oct 2023 13:50:47 -0500 Subject: [PATCH 2/5] chore: use prepare script --- .github/workflows/main.yml | 257 +----------------- .../peer-and-content-routing/package.json | 2 +- packages/crypto/package.json | 2 +- packages/interface/package.json | 2 +- packages/kad-dht/package.json | 2 +- packages/keychain/package.json | 2 +- packages/libp2p/package.json | 2 +- packages/logger/package.json | 2 +- packages/peer-id-factory/package.json | 2 +- packages/peer-id/package.json | 2 +- packages/peer-store/package.json | 2 +- packages/pubsub-floodsub/package.json | 2 +- packages/pubsub/package.json | 2 +- packages/transport-webrtc/package.json | 2 +- packages/transport-webtransport/package.json | 2 +- 15 files changed, 17 insertions(+), 268 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a354658173..ddd7ee8360 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,266 +5,15 @@ on: - master pull_request: branches: - - '**' + - "**" jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: lts/* - - uses: ipfs/aegir/actions/cache-node-modules@master - - check: - needs: build - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: lts/* - - uses: ipfs/aegir/actions/cache-node-modules@master - - run: npm run --if-present lint - - run: npm run --if-present dep-check - - run: npm run --if-present doc-check - - test-node: - needs: build - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [windows-latest, ubuntu-latest, macos-latest] - node: [lts/*] - fail-fast: true - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node }} - - uses: ipfs/aegir/actions/cache-node-modules@master - - run: npm run --if-present test:node - - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0 - with: - directory: ./.nyc_output - flags: node - - test-chrome: - needs: build - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: lts/* - - uses: ipfs/aegir/actions/cache-node-modules@master - - run: npm run --if-present test:chrome - - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0 - with: - directory: ./.nyc_output - flags: chrome - - test-chrome-webworker: - needs: build - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: lts/* - - uses: ipfs/aegir/actions/cache-node-modules@master - - run: npm run --if-present test:chrome-webworker - - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0 - with: - directory: ./.nyc_output - flags: chrome-webworker - - test-firefox: - needs: build - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: lts/* - - uses: ipfs/aegir/actions/cache-node-modules@master - - run: npm run --if-present test:firefox - - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0 - with: - directory: ./.nyc_output - flags: firefox - - test-firefox-webworker: - needs: build - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: lts/* - - uses: ipfs/aegir/actions/cache-node-modules@master - - run: npm run --if-present test:firefox-webworker - - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0 - with: - directory: ./.nyc_output - flags: firefox-webworker - - test-webkit: - needs: build - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: lts/* - - uses: ipfs/aegir/actions/cache-node-modules@master - - run: npx playwright install-deps - - run: npm run --if-present test:webkit - - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0 - with: - directory: ./.nyc_output - flags: webkit - - test-electron-main: - needs: build - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: lts/* - - uses: ipfs/aegir/actions/cache-node-modules@master - - run: npx xvfb-maybe npm run --if-present test:electron-main - - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0 - with: - directory: ./.nyc_output - flags: electron-main - - test-electron-renderer: - needs: build - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: lts/* - - uses: ipfs/aegir/actions/cache-node-modules@master - - run: npx xvfb-maybe npm run --if-present test:electron-renderer - - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0 - with: - directory: ./.nyc_output - flags: electron-renderer - - test-interop: - needs: build runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: node-version: lts/* - - uses: ipfs/aegir/actions/cache-node-modules@master - - run: npm run test:interop -- --bail - - test-examples: - needs: build - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: lts/* - - uses: ipfs/aegir/actions/cache-node-modules@master - - run: npm run --if-present test:example - - transport-interop: - needs: build - runs-on: ${{ fromJSON(github.repository == 'libp2p/js-libp2p' && '["self-hosted", "linux", "x64", "4xlarge"]' || '"ubuntu-latest"') }} - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: lts/* - - uses: ipfs/aegir/actions/cache-node-modules@master - - name: Build images - run: (cd interop && make -j 4) - - name: Save package-lock.json as artifact - uses: actions/upload-artifact@v2 - with: - name: package locks - path: | - package-lock.json - interop/package-lock.json - - uses: libp2p/test-plans/.github/actions/run-interop-ping-test@master - with: - test-filter: js-libp2p-head - test-ignore: nim - extra-versions: ${{ github.workspace }}/interop/node-version.json ${{ github.workspace }}/interop/chromium-version.json ${{ github.workspace }}/interop/firefox-version.json - s3-cache-bucket: ${{ vars.S3_LIBP2P_BUILD_CACHE_BUCKET_NAME }} - s3-access-key-id: ${{ vars.S3_LIBP2P_BUILD_CACHE_AWS_ACCESS_KEY_ID }} - s3-secret-access-key: ${{ secrets.S3_LIBP2P_BUILD_CACHE_AWS_SECRET_ACCESS_KEY }} - worker-count: 16 - - release: - runs-on: ubuntu-latest - needs: [ - test-node, - test-chrome, - test-chrome-webworker, - test-firefox, - test-firefox-webworker, - test-electron-main, - test-electron-renderer, - test-interop, - test-examples, - transport-interop - ] - if: github.event_name == 'push' && github.ref == 'refs/heads/master' - steps: - - uses: GoogleCloudPlatform/release-please-action@v2 - id: release - with: - token: ${{ secrets.GITHUB_TOKEN }} - command: manifest - release-type: node - manifest-file: .release-please-manifest.json - config-file: .release-please.json - changelog-types: | - [ - { "type": "feat", "section": "Features", "hidden": false }, - { "type": "fix", "section": "Bug Fixes", "hidden": false }, - { "type": "chore", "section": "Trivial Changes", "hidden": false }, - { "type": "docs", "section": "Documentation", "hidden": false }, - { "type": "deps", "section": "Dependencies", "hidden": false }, - { "type": "refactor", "section": "Refactors", "hidden": false } - ] - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - uses: actions/setup-node@v3 - with: - node-version: lts/* - registry-url: 'https://registry.npmjs.org' - - uses: ipfs/aegir/actions/cache-node-modules@master - - uses: ipfs/aegir/actions/docker-login@master - with: - docker-token: ${{ secrets.DOCKER_TOKEN }} - docker-username: ${{ secrets.DOCKER_USERNAME }} - - if: ${{ steps.release.outputs.releases_created }} - name: Run release version - run: | - git update-index --assume-unchanged packages/libp2p/src/version.ts - npm run --if-present release - env: - GITHUB_TOKEN: ${{ secrets.UCI_GITHUB_TOKEN || github.token }} - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - - if: ${{ !steps.release.outputs.releases_created }} - name: Run release rc - run: | - git update-index --assume-unchanged packages/libp2p/src/version.ts - npm run --if-present release:rc - env: - GITHUB_TOKEN: ${{ secrets.UCI_GITHUB_TOKEN || github.token }} - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + - run: npm i --production + - run: npm run build diff --git a/examples/peer-and-content-routing/package.json b/examples/peer-and-content-routing/package.json index 71c445f0d7..148461cdb7 100644 --- a/examples/peer-and-content-routing/package.json +++ b/examples/peer-and-content-routing/package.json @@ -38,7 +38,7 @@ "delay": "^6.0.0", "it-all": "^3.0.2", "libp2p": "^0.46.0", - "multiformats": "github:multiformats/js-multiformats#feat/typescript" + "multiformats": "github:maschad/js-multiformats#add-prepare-script" }, "devDependencies": { "aegir": "^41.0.2", diff --git a/packages/crypto/package.json b/packages/crypto/package.json index 0d0cd51e13..3e94e7f6ae 100644 --- a/packages/crypto/package.json +++ b/packages/crypto/package.json @@ -89,7 +89,7 @@ "@libp2p/interface": "^0.1.3", "@noble/curves": "^1.1.0", "@noble/hashes": "^1.3.1", - "multiformats": "github:multiformats/js-multiformats#feat/typescript", + "multiformats": "github:maschad/js-multiformats#add-prepare-script", "node-forge": "^1.1.0", "protons-runtime": "^5.0.0", "uint8arraylist": "^2.4.3", diff --git a/packages/interface/package.json b/packages/interface/package.json index abfebf68fd..ac516fa50a 100644 --- a/packages/interface/package.json +++ b/packages/interface/package.json @@ -162,7 +162,7 @@ "abortable-iterator": "^5.0.1", "it-pushable": "^3.2.0", "it-stream-types": "^2.0.1", - "multiformats": "github:multiformats/js-multiformats#feat/typescript", + "multiformats": "github:maschad/js-multiformats#add-prepare-script", "p-defer": "^4.0.0", "race-signal": "^1.0.0", "uint8arraylist": "^2.4.3" diff --git a/packages/kad-dht/package.json b/packages/kad-dht/package.json index 153ab039e9..e1ff672248 100644 --- a/packages/kad-dht/package.json +++ b/packages/kad-dht/package.json @@ -77,7 +77,7 @@ "it-pipe": "^3.0.1", "it-stream-types": "^2.0.1", "it-take": "^3.0.1", - "multiformats": "github:multiformats/js-multiformats#feat/typescript", + "multiformats": "github:maschad/js-multiformats#add-prepare-script", "p-defer": "^4.0.0", "p-event": "^6.0.0", "p-queue": "^7.3.4", diff --git a/packages/keychain/package.json b/packages/keychain/package.json index 495cb99461..c1a6abc445 100644 --- a/packages/keychain/package.json +++ b/packages/keychain/package.json @@ -67,6 +67,6 @@ "@libp2p/peer-id-factory": "^3.0.5", "aegir": "^41.0.2", "datastore-core": "^9.1.1", - "multiformats": "github:multiformats/js-multiformats#feat/typescript" + "multiformats": "github:maschad/js-multiformats#add-prepare-script" } } diff --git a/packages/libp2p/package.json b/packages/libp2p/package.json index 93ad0f9082..b7290efca3 100644 --- a/packages/libp2p/package.json +++ b/packages/libp2p/package.json @@ -155,7 +155,7 @@ "it-protobuf-stream": "^1.0.0", "it-stream-types": "^2.0.1", "merge-options": "^3.0.4", - "multiformats": "github:multiformats/js-multiformats#feat/typescript", + "multiformats": "github:maschad/js-multiformats#add-prepare-script", "p-defer": "^4.0.0", "p-queue": "^7.3.4", "p-retry": "^6.0.0", diff --git a/packages/logger/package.json b/packages/logger/package.json index 472c6859d4..5b9a55152b 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -53,7 +53,7 @@ "@multiformats/multiaddr": "^12.1.5", "debug": "^4.3.4", "interface-datastore": "^8.2.0", - "multiformats": "github:multiformats/js-multiformats#feat/typescript" + "multiformats": "github:maschad/js-multiformats#add-prepare-script" }, "devDependencies": { "@libp2p/peer-id": "^3.0.3", diff --git a/packages/peer-id-factory/package.json b/packages/peer-id-factory/package.json index 4d58f576d7..e2b65a029b 100644 --- a/packages/peer-id-factory/package.json +++ b/packages/peer-id-factory/package.json @@ -56,7 +56,7 @@ "@libp2p/crypto": "^2.0.5", "@libp2p/interface": "^0.1.3", "@libp2p/peer-id": "^3.0.3", - "multiformats": "github:multiformats/js-multiformats#feat/typescript", + "multiformats": "github:maschad/js-multiformats#add-prepare-script", "protons-runtime": "^5.0.0", "uint8arraylist": "^2.4.3", "uint8arrays": "^4.0.6" diff --git a/packages/peer-id/package.json b/packages/peer-id/package.json index 425a3d50b7..05a33a7df1 100644 --- a/packages/peer-id/package.json +++ b/packages/peer-id/package.json @@ -50,7 +50,7 @@ }, "dependencies": { "@libp2p/interface": "^0.1.3", - "multiformats": "github:multiformats/js-multiformats#feat/typescript", + "multiformats": "github:maschad/js-multiformats#add-prepare-script", "uint8arrays": "^4.0.6" }, "devDependencies": { diff --git a/packages/peer-store/package.json b/packages/peer-store/package.json index f7ad78f7d0..41c843d5cc 100644 --- a/packages/peer-store/package.json +++ b/packages/peer-store/package.json @@ -64,7 +64,7 @@ "interface-datastore": "^8.2.0", "it-all": "^3.0.2", "mortice": "^3.0.1", - "multiformats": "github:multiformats/js-multiformats#feat/typescript", + "multiformats": "github:maschad/js-multiformats#add-prepare-script", "protons-runtime": "^5.0.0", "uint8arraylist": "^2.4.3", "uint8arrays": "^4.0.6" diff --git a/packages/pubsub-floodsub/package.json b/packages/pubsub-floodsub/package.json index a6a831f27d..e193db9216 100644 --- a/packages/pubsub-floodsub/package.json +++ b/packages/pubsub-floodsub/package.json @@ -69,7 +69,7 @@ "@multiformats/multiaddr": "^12.1.3", "@types/sinon": "^10.0.15", "aegir": "^41.0.2", - "multiformats": "github:multiformats/js-multiformats#feat/typescript", + "multiformats": "github:maschad/js-multiformats#add-prepare-script", "p-wait-for": "^5.0.2", "protons": "^7.0.2", "sinon": "^16.0.0" diff --git a/packages/pubsub/package.json b/packages/pubsub/package.json index 3edc022238..167d92a03f 100644 --- a/packages/pubsub/package.json +++ b/packages/pubsub/package.json @@ -89,7 +89,7 @@ "it-length-prefixed": "^9.0.1", "it-pipe": "^3.0.1", "it-pushable": "^3.2.0", - "multiformats": "github:multiformats/js-multiformats#feat/typescript", + "multiformats": "github:maschad/js-multiformats#add-prepare-script", "p-queue": "^7.3.4", "uint8arraylist": "^2.4.3", "uint8arrays": "^4.0.6" diff --git a/packages/transport-webrtc/package.json b/packages/transport-webrtc/package.json index 9375b45805..527f2979ee 100644 --- a/packages/transport-webrtc/package.json +++ b/packages/transport-webrtc/package.json @@ -62,7 +62,7 @@ "it-pushable": "^3.2.0", "it-stream-types": "^2.0.1", "it-to-buffer": "^4.0.2", - "multiformats": "github:multiformats/js-multiformats#feat/typescript", + "multiformats": "github:maschad/js-multiformats#add-prepare-script", "multihashes": "^4.0.3", "node-datachannel": "^0.5.0-dev", "p-defer": "^4.0.0", diff --git a/packages/transport-webtransport/package.json b/packages/transport-webtransport/package.json index 66c5a028da..5b37d44406 100644 --- a/packages/transport-webtransport/package.json +++ b/packages/transport-webtransport/package.json @@ -68,7 +68,7 @@ "@multiformats/multiaddr": "^12.1.5", "@multiformats/multiaddr-matcher": "^1.0.1", "it-stream-types": "^2.0.1", - "multiformats": "github:multiformats/js-multiformats#feat/typescript", + "multiformats": "github:maschad/js-multiformats#add-prepare-script", "uint8arraylist": "^2.4.3", "uint8arrays": "^4.0.6" }, From ab9469c408e72e4a2c3150dd8025839113284aa3 Mon Sep 17 00:00:00 2001 From: chad Date: Thu, 12 Oct 2023 16:57:47 -0500 Subject: [PATCH 3/5] ci: exclude test directories and only build direct dependencies --- interop/tsconfig.json | 3 +-- packages/crypto/tsconfig.json | 3 +-- packages/interface-compliance-tests/tsconfig.json | 3 +-- packages/interface/tsconfig.json | 3 +-- packages/kad-dht/tsconfig.json | 1 - packages/keychain/tsconfig.json | 3 +-- packages/libp2p/package.json | 4 ++-- packages/libp2p/tsconfig.json | 3 +-- packages/logger/tsconfig.json | 3 +-- packages/metrics-prometheus/tsconfig.json | 3 +-- packages/multistream-select/tsconfig.json | 3 +-- packages/peer-collections/tsconfig.json | 3 +-- packages/peer-discovery-bootstrap/tsconfig.json | 3 +-- packages/peer-discovery-mdns/tsconfig.json | 3 +-- packages/peer-id-factory/tsconfig.json | 3 +-- packages/peer-id/tsconfig.json | 3 +-- packages/peer-record/tsconfig.json | 3 +-- packages/peer-store/tsconfig.json | 3 +-- packages/protocol-perf/tsconfig.json | 3 +-- packages/pubsub-floodsub/tsconfig.json | 3 +-- packages/pubsub/tsconfig.json | 3 +-- packages/stream-multiplexer-mplex/tsconfig.json | 3 +-- packages/transport-tcp/tsconfig.json | 3 +-- packages/transport-webrtc/tsconfig.json | 1 - packages/transport-websockets/tsconfig.json | 3 +-- packages/transport-webtransport/tsconfig.json | 3 +-- packages/utils/tsconfig.json | 3 +-- 27 files changed, 26 insertions(+), 52 deletions(-) diff --git a/interop/tsconfig.json b/interop/tsconfig.json index 5be3797bc7..65d6e78c46 100644 --- a/interop/tsconfig.json +++ b/interop/tsconfig.json @@ -4,8 +4,7 @@ "outDir": "dist" }, "include": [ - "src", - "test" + "src" ], "references": [ { diff --git a/packages/crypto/tsconfig.json b/packages/crypto/tsconfig.json index 4c0bdf7723..d9a96ac2b0 100644 --- a/packages/crypto/tsconfig.json +++ b/packages/crypto/tsconfig.json @@ -4,8 +4,7 @@ "outDir": "dist" }, "include": [ - "src", - "test" + "src" ], "references": [ { diff --git a/packages/interface-compliance-tests/tsconfig.json b/packages/interface-compliance-tests/tsconfig.json index 8251520fe9..c8cd3d746a 100644 --- a/packages/interface-compliance-tests/tsconfig.json +++ b/packages/interface-compliance-tests/tsconfig.json @@ -4,8 +4,7 @@ "outDir": "dist" }, "include": [ - "src", - "test" + "src" ], "references": [ { diff --git a/packages/interface/tsconfig.json b/packages/interface/tsconfig.json index 13a3599639..5fe8ea40d7 100644 --- a/packages/interface/tsconfig.json +++ b/packages/interface/tsconfig.json @@ -4,7 +4,6 @@ "outDir": "dist" }, "include": [ - "src", - "test" + "src" ] } diff --git a/packages/kad-dht/tsconfig.json b/packages/kad-dht/tsconfig.json index 7f889f2ac5..5f7b17a1dc 100644 --- a/packages/kad-dht/tsconfig.json +++ b/packages/kad-dht/tsconfig.json @@ -5,7 +5,6 @@ }, "include": [ "src", - "test" ], "references": [ { diff --git a/packages/keychain/tsconfig.json b/packages/keychain/tsconfig.json index b471419c56..8e09119f0d 100644 --- a/packages/keychain/tsconfig.json +++ b/packages/keychain/tsconfig.json @@ -6,8 +6,7 @@ "module": "ES2020" }, "include": [ - "src", - "test" + "src" ], "references": [ { diff --git a/packages/libp2p/package.json b/packages/libp2p/package.json index b7290efca3..87b0823a2f 100644 --- a/packages/libp2p/package.json +++ b/packages/libp2p/package.json @@ -165,7 +165,8 @@ "uint8arraylist": "^2.4.3", "uint8arrays": "^4.0.6", "wherearewe": "^2.0.1", - "xsalsa20": "^1.1.0" + "xsalsa20": "^1.1.0", + "@types/xsalsa20": "^1.1.0" }, "devDependencies": { "@chainsafe/libp2p-gossipsub": "^10.0.0", @@ -182,7 +183,6 @@ "@libp2p/mplex": "^9.0.8", "@libp2p/tcp": "^8.0.9", "@libp2p/websockets": "^7.0.9", - "@types/xsalsa20": "^1.1.0", "aegir": "^41.0.2", "execa": "^8.0.1", "go-libp2p": "^1.1.1", diff --git a/packages/libp2p/tsconfig.json b/packages/libp2p/tsconfig.json index e52e22da16..0ff676d1d2 100644 --- a/packages/libp2p/tsconfig.json +++ b/packages/libp2p/tsconfig.json @@ -4,8 +4,7 @@ "outDir": "dist" }, "include": [ - "src", - "test" + "src" ], "references": [ { diff --git a/packages/logger/tsconfig.json b/packages/logger/tsconfig.json index 7900c5e27d..373d2fba51 100644 --- a/packages/logger/tsconfig.json +++ b/packages/logger/tsconfig.json @@ -4,8 +4,7 @@ "outDir": "dist" }, "include": [ - "src", - "test" + "src" ], "references": [ { diff --git a/packages/metrics-prometheus/tsconfig.json b/packages/metrics-prometheus/tsconfig.json index 6083208574..05691821a0 100644 --- a/packages/metrics-prometheus/tsconfig.json +++ b/packages/metrics-prometheus/tsconfig.json @@ -4,8 +4,7 @@ "outDir": "dist" }, "include": [ - "src", - "test" + "src" ], "references": [ { diff --git a/packages/multistream-select/tsconfig.json b/packages/multistream-select/tsconfig.json index b382e52ffe..c4f39b4624 100644 --- a/packages/multistream-select/tsconfig.json +++ b/packages/multistream-select/tsconfig.json @@ -4,8 +4,7 @@ "outDir": "dist" }, "include": [ - "src", - "test" + "src" ], "references": [ { diff --git a/packages/peer-collections/tsconfig.json b/packages/peer-collections/tsconfig.json index 4795efb1d1..330d3c00ae 100644 --- a/packages/peer-collections/tsconfig.json +++ b/packages/peer-collections/tsconfig.json @@ -4,8 +4,7 @@ "outDir": "dist" }, "include": [ - "src", - "test" + "src" ], "references": [ { diff --git a/packages/peer-discovery-bootstrap/tsconfig.json b/packages/peer-discovery-bootstrap/tsconfig.json index 51b0155870..de65821a8b 100644 --- a/packages/peer-discovery-bootstrap/tsconfig.json +++ b/packages/peer-discovery-bootstrap/tsconfig.json @@ -6,8 +6,7 @@ "module": "ES2020" }, "include": [ - "src", - "test" + "src" ], "references": [ { diff --git a/packages/peer-discovery-mdns/tsconfig.json b/packages/peer-discovery-mdns/tsconfig.json index 556dd28bf9..0a83e9450a 100644 --- a/packages/peer-discovery-mdns/tsconfig.json +++ b/packages/peer-discovery-mdns/tsconfig.json @@ -4,8 +4,7 @@ "outDir": "dist" }, "include": [ - "src", - "test" + "src" ], "references": [ { diff --git a/packages/peer-id-factory/tsconfig.json b/packages/peer-id-factory/tsconfig.json index 74af969900..d50c1a9585 100644 --- a/packages/peer-id-factory/tsconfig.json +++ b/packages/peer-id-factory/tsconfig.json @@ -4,8 +4,7 @@ "outDir": "dist" }, "include": [ - "src", - "test" + "src" ], "references": [ { diff --git a/packages/peer-id/tsconfig.json b/packages/peer-id/tsconfig.json index 4c0bdf7723..d9a96ac2b0 100644 --- a/packages/peer-id/tsconfig.json +++ b/packages/peer-id/tsconfig.json @@ -4,8 +4,7 @@ "outDir": "dist" }, "include": [ - "src", - "test" + "src" ], "references": [ { diff --git a/packages/peer-record/tsconfig.json b/packages/peer-record/tsconfig.json index 3052d247ba..e92a104111 100644 --- a/packages/peer-record/tsconfig.json +++ b/packages/peer-record/tsconfig.json @@ -4,8 +4,7 @@ "outDir": "dist" }, "include": [ - "src", - "test" + "src" ], "references": [ { diff --git a/packages/peer-store/tsconfig.json b/packages/peer-store/tsconfig.json index 7520207294..9134078d6c 100644 --- a/packages/peer-store/tsconfig.json +++ b/packages/peer-store/tsconfig.json @@ -4,8 +4,7 @@ "outDir": "dist" }, "include": [ - "src", - "test" + "src" ], "exclude": [ "src/pb/peer.js" diff --git a/packages/protocol-perf/tsconfig.json b/packages/protocol-perf/tsconfig.json index 441774e960..b29c2409a7 100644 --- a/packages/protocol-perf/tsconfig.json +++ b/packages/protocol-perf/tsconfig.json @@ -4,8 +4,7 @@ "outDir": "dist" }, "include": [ - "src", - "test" + "src" ], "references": [ { diff --git a/packages/pubsub-floodsub/tsconfig.json b/packages/pubsub-floodsub/tsconfig.json index 22dbd7db0d..6891ae64ce 100644 --- a/packages/pubsub-floodsub/tsconfig.json +++ b/packages/pubsub-floodsub/tsconfig.json @@ -4,8 +4,7 @@ "outDir": "dist" }, "include": [ - "src", - "test" + "src" ], "references": [ { diff --git a/packages/pubsub/tsconfig.json b/packages/pubsub/tsconfig.json index 4061e84433..d7227c9f02 100644 --- a/packages/pubsub/tsconfig.json +++ b/packages/pubsub/tsconfig.json @@ -4,8 +4,7 @@ "outDir": "dist" }, "include": [ - "src", - "test" + "src" ], "exclude": [ "test/message/rpc.js" diff --git a/packages/stream-multiplexer-mplex/tsconfig.json b/packages/stream-multiplexer-mplex/tsconfig.json index c1ac576e1b..afe39e140d 100644 --- a/packages/stream-multiplexer-mplex/tsconfig.json +++ b/packages/stream-multiplexer-mplex/tsconfig.json @@ -4,8 +4,7 @@ "outDir": "dist" }, "include": [ - "src", - "test" + "src" ], "references": [ { diff --git a/packages/transport-tcp/tsconfig.json b/packages/transport-tcp/tsconfig.json index b5b8e9d6e1..d34296762c 100644 --- a/packages/transport-tcp/tsconfig.json +++ b/packages/transport-tcp/tsconfig.json @@ -4,8 +4,7 @@ "outDir": "dist" }, "include": [ - "src", - "test" + "src" ], "references": [ { diff --git a/packages/transport-webrtc/tsconfig.json b/packages/transport-webrtc/tsconfig.json index 4008808465..3440eab5e8 100644 --- a/packages/transport-webrtc/tsconfig.json +++ b/packages/transport-webrtc/tsconfig.json @@ -5,7 +5,6 @@ }, "include": [ "src", - "test", "proto_ts" ], "references": [ diff --git a/packages/transport-websockets/tsconfig.json b/packages/transport-websockets/tsconfig.json index b5b8e9d6e1..d34296762c 100644 --- a/packages/transport-websockets/tsconfig.json +++ b/packages/transport-websockets/tsconfig.json @@ -4,8 +4,7 @@ "outDir": "dist" }, "include": [ - "src", - "test" + "src" ], "references": [ { diff --git a/packages/transport-webtransport/tsconfig.json b/packages/transport-webtransport/tsconfig.json index 0344702f51..0f9733b638 100644 --- a/packages/transport-webtransport/tsconfig.json +++ b/packages/transport-webtransport/tsconfig.json @@ -4,8 +4,7 @@ "outDir": "dist" }, "include": [ - "src", - "test" + "src" ], "references": [ { diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json index b382e52ffe..c4f39b4624 100644 --- a/packages/utils/tsconfig.json +++ b/packages/utils/tsconfig.json @@ -4,8 +4,7 @@ "outDir": "dist" }, "include": [ - "src", - "test" + "src" ], "references": [ { From dde266c9eb49f73b74866d031b593803b1fd1eeb Mon Sep 17 00:00:00 2001 From: chad Date: Thu, 12 Oct 2023 21:24:57 -0500 Subject: [PATCH 4/5] ci: run ci tests with new multiformats --- .github/workflows/main.yml | 253 +++++++++++++++++- interop/tsconfig.json | 3 +- packages/crypto/tsconfig.json | 3 +- .../interface-compliance-tests/tsconfig.json | 3 +- packages/interface-internal/tsconfig.json | 3 +- packages/interface/tsconfig.json | 3 +- packages/kad-dht/tsconfig.json | 1 + packages/keychain/tsconfig.json | 3 +- packages/libp2p/tsconfig.json | 3 +- packages/logger/tsconfig.json | 3 +- packages/metrics-prometheus/tsconfig.json | 3 +- packages/multistream-select/tsconfig.json | 3 +- packages/peer-collections/tsconfig.json | 3 +- .../peer-discovery-bootstrap/tsconfig.json | 3 +- packages/peer-discovery-mdns/tsconfig.json | 3 +- packages/peer-id-factory/tsconfig.json | 3 +- packages/peer-id/tsconfig.json | 3 +- packages/peer-record/tsconfig.json | 3 +- packages/peer-store/tsconfig.json | 3 +- packages/protocol-perf/tsconfig.json | 3 +- packages/pubsub-floodsub/tsconfig.json | 3 +- packages/pubsub/tsconfig.json | 3 +- .../stream-multiplexer-mplex/tsconfig.json | 3 +- packages/transport-tcp/tsconfig.json | 3 +- packages/transport-webrtc/tsconfig.json | 1 + packages/transport-websockets/tsconfig.json | 3 +- packages/transport-webtransport/tsconfig.json | 3 +- packages/utils/tsconfig.json | 3 +- 28 files changed, 304 insertions(+), 26 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ddd7ee8360..2203d8ce2e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,5 +15,256 @@ jobs: - uses: actions/setup-node@v3 with: node-version: lts/* - - run: npm i --production + - run: npm i - run: npm run build + + check: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: lts/* + - run: npm run --if-present lint + - run: npm run --if-present dep-check + - run: npm run --if-present doc-check + + test-node: + needs: build + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [windows-latest, ubuntu-latest, macos-latest] + node: [lts/*] + fail-fast: true + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node }} + + - run: npm run --if-present test:node + - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0 + with: + directory: ./.nyc_output + flags: node + + test-chrome: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: lts/* + + - run: npm run --if-present test:chrome + - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0 + with: + directory: ./.nyc_output + flags: chrome + + test-chrome-webworker: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: lts/* + + - run: npm run --if-present test:chrome-webworker + - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0 + with: + directory: ./.nyc_output + flags: chrome-webworker + + test-firefox: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: lts/* + + - run: npm run --if-present test:firefox + - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0 + with: + directory: ./.nyc_output + flags: firefox + + test-firefox-webworker: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: lts/* + + - run: npm run --if-present test:firefox-webworker + - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0 + with: + directory: ./.nyc_output + flags: firefox-webworker + + test-webkit: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: lts/* + + - run: npx playwright install-deps + - run: npm run --if-present test:webkit + - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0 + with: + directory: ./.nyc_output + flags: webkit + + test-electron-main: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: lts/* + + - run: npx xvfb-maybe npm run --if-present test:electron-main + - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0 + with: + directory: ./.nyc_output + flags: electron-main + + test-electron-renderer: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: lts/* + + - run: npx xvfb-maybe npm run --if-present test:electron-renderer + - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0 + with: + directory: ./.nyc_output + flags: electron-renderer + + test-interop: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: lts/* + + - run: npm run test:interop -- --bail + + test-examples: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: lts/* + + - run: npm run --if-present test:example + + transport-interop: + needs: build + runs-on: ${{ fromJSON(github.repository == 'libp2p/js-libp2p' && '["self-hosted", "linux", "x64", "4xlarge"]' || '"ubuntu-latest"') }} + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: lts/* + + - name: Build images + run: (cd interop && make -j 4) + - name: Save package-lock.json as artifact + uses: actions/upload-artifact@v2 + with: + name: package locks + path: | + package-lock.json + interop/package-lock.json + - uses: libp2p/test-plans/.github/actions/run-interop-ping-test@master + with: + test-filter: js-libp2p-head + test-ignore: nim + extra-versions: ${{ github.workspace }}/interop/node-version.json ${{ github.workspace }}/interop/chromium-version.json ${{ github.workspace }}/interop/firefox-version.json + s3-cache-bucket: ${{ vars.S3_LIBP2P_BUILD_CACHE_BUCKET_NAME }} + s3-access-key-id: ${{ vars.S3_LIBP2P_BUILD_CACHE_AWS_ACCESS_KEY_ID }} + s3-secret-access-key: ${{ secrets.S3_LIBP2P_BUILD_CACHE_AWS_SECRET_ACCESS_KEY }} + worker-count: 16 + + release: + runs-on: ubuntu-latest + needs: + [ + test-node, + test-chrome, + test-chrome-webworker, + test-firefox, + test-firefox-webworker, + test-electron-main, + test-electron-renderer, + test-interop, + test-examples, + transport-interop, + ] + if: github.event_name == 'push' && github.ref == 'refs/heads/master' + steps: + - uses: GoogleCloudPlatform/release-please-action@v2 + id: release + with: + token: ${{ secrets.GITHUB_TOKEN }} + command: manifest + release-type: node + manifest-file: .release-please-manifest.json + config-file: .release-please.json + changelog-types: | + [ + { "type": "feat", "section": "Features", "hidden": false }, + { "type": "fix", "section": "Bug Fixes", "hidden": false }, + { "type": "chore", "section": "Trivial Changes", "hidden": false }, + { "type": "docs", "section": "Documentation", "hidden": false }, + { "type": "deps", "section": "Dependencies", "hidden": false }, + { "type": "refactor", "section": "Refactors", "hidden": false } + ] + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - uses: actions/setup-node@v3 + with: + node-version: lts/* + registry-url: "https://registry.npmjs.org" + + - uses: ipfs/aegir/actions/docker-login@master + with: + docker-token: ${{ secrets.DOCKER_TOKEN }} + docker-username: ${{ secrets.DOCKER_USERNAME }} + - if: ${{ steps.release.outputs.releases_created }} + name: Run release version + run: | + git update-index --assume-unchanged packages/libp2p/src/version.ts + npm run --if-present release + env: + GITHUB_TOKEN: ${{ secrets.UCI_GITHUB_TOKEN || github.token }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + - if: ${{ !steps.release.outputs.releases_created }} + name: Run release rc + run: | + git update-index --assume-unchanged packages/libp2p/src/version.ts + npm run --if-present release:rc + env: + GITHUB_TOKEN: ${{ secrets.UCI_GITHUB_TOKEN || github.token }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/interop/tsconfig.json b/interop/tsconfig.json index 65d6e78c46..5be3797bc7 100644 --- a/interop/tsconfig.json +++ b/interop/tsconfig.json @@ -4,7 +4,8 @@ "outDir": "dist" }, "include": [ - "src" + "src", + "test" ], "references": [ { diff --git a/packages/crypto/tsconfig.json b/packages/crypto/tsconfig.json index d9a96ac2b0..4c0bdf7723 100644 --- a/packages/crypto/tsconfig.json +++ b/packages/crypto/tsconfig.json @@ -4,7 +4,8 @@ "outDir": "dist" }, "include": [ - "src" + "src", + "test" ], "references": [ { diff --git a/packages/interface-compliance-tests/tsconfig.json b/packages/interface-compliance-tests/tsconfig.json index c8cd3d746a..8251520fe9 100644 --- a/packages/interface-compliance-tests/tsconfig.json +++ b/packages/interface-compliance-tests/tsconfig.json @@ -4,7 +4,8 @@ "outDir": "dist" }, "include": [ - "src" + "src", + "test" ], "references": [ { diff --git a/packages/interface-internal/tsconfig.json b/packages/interface-internal/tsconfig.json index 67dca032e3..43e612d0a4 100644 --- a/packages/interface-internal/tsconfig.json +++ b/packages/interface-internal/tsconfig.json @@ -4,7 +4,8 @@ "outDir": "dist" }, "include": [ - "src" + "src", + "test" ], "references": [ { diff --git a/packages/interface/tsconfig.json b/packages/interface/tsconfig.json index 5fe8ea40d7..13a3599639 100644 --- a/packages/interface/tsconfig.json +++ b/packages/interface/tsconfig.json @@ -4,6 +4,7 @@ "outDir": "dist" }, "include": [ - "src" + "src", + "test" ] } diff --git a/packages/kad-dht/tsconfig.json b/packages/kad-dht/tsconfig.json index 5f7b17a1dc..7f889f2ac5 100644 --- a/packages/kad-dht/tsconfig.json +++ b/packages/kad-dht/tsconfig.json @@ -5,6 +5,7 @@ }, "include": [ "src", + "test" ], "references": [ { diff --git a/packages/keychain/tsconfig.json b/packages/keychain/tsconfig.json index 8e09119f0d..b471419c56 100644 --- a/packages/keychain/tsconfig.json +++ b/packages/keychain/tsconfig.json @@ -6,7 +6,8 @@ "module": "ES2020" }, "include": [ - "src" + "src", + "test" ], "references": [ { diff --git a/packages/libp2p/tsconfig.json b/packages/libp2p/tsconfig.json index 0ff676d1d2..e52e22da16 100644 --- a/packages/libp2p/tsconfig.json +++ b/packages/libp2p/tsconfig.json @@ -4,7 +4,8 @@ "outDir": "dist" }, "include": [ - "src" + "src", + "test" ], "references": [ { diff --git a/packages/logger/tsconfig.json b/packages/logger/tsconfig.json index 373d2fba51..7900c5e27d 100644 --- a/packages/logger/tsconfig.json +++ b/packages/logger/tsconfig.json @@ -4,7 +4,8 @@ "outDir": "dist" }, "include": [ - "src" + "src", + "test" ], "references": [ { diff --git a/packages/metrics-prometheus/tsconfig.json b/packages/metrics-prometheus/tsconfig.json index 05691821a0..6083208574 100644 --- a/packages/metrics-prometheus/tsconfig.json +++ b/packages/metrics-prometheus/tsconfig.json @@ -4,7 +4,8 @@ "outDir": "dist" }, "include": [ - "src" + "src", + "test" ], "references": [ { diff --git a/packages/multistream-select/tsconfig.json b/packages/multistream-select/tsconfig.json index c4f39b4624..b382e52ffe 100644 --- a/packages/multistream-select/tsconfig.json +++ b/packages/multistream-select/tsconfig.json @@ -4,7 +4,8 @@ "outDir": "dist" }, "include": [ - "src" + "src", + "test" ], "references": [ { diff --git a/packages/peer-collections/tsconfig.json b/packages/peer-collections/tsconfig.json index 330d3c00ae..4795efb1d1 100644 --- a/packages/peer-collections/tsconfig.json +++ b/packages/peer-collections/tsconfig.json @@ -4,7 +4,8 @@ "outDir": "dist" }, "include": [ - "src" + "src", + "test" ], "references": [ { diff --git a/packages/peer-discovery-bootstrap/tsconfig.json b/packages/peer-discovery-bootstrap/tsconfig.json index de65821a8b..51b0155870 100644 --- a/packages/peer-discovery-bootstrap/tsconfig.json +++ b/packages/peer-discovery-bootstrap/tsconfig.json @@ -6,7 +6,8 @@ "module": "ES2020" }, "include": [ - "src" + "src", + "test" ], "references": [ { diff --git a/packages/peer-discovery-mdns/tsconfig.json b/packages/peer-discovery-mdns/tsconfig.json index 0a83e9450a..556dd28bf9 100644 --- a/packages/peer-discovery-mdns/tsconfig.json +++ b/packages/peer-discovery-mdns/tsconfig.json @@ -4,7 +4,8 @@ "outDir": "dist" }, "include": [ - "src" + "src", + "test" ], "references": [ { diff --git a/packages/peer-id-factory/tsconfig.json b/packages/peer-id-factory/tsconfig.json index d50c1a9585..74af969900 100644 --- a/packages/peer-id-factory/tsconfig.json +++ b/packages/peer-id-factory/tsconfig.json @@ -4,7 +4,8 @@ "outDir": "dist" }, "include": [ - "src" + "src", + "test" ], "references": [ { diff --git a/packages/peer-id/tsconfig.json b/packages/peer-id/tsconfig.json index d9a96ac2b0..4c0bdf7723 100644 --- a/packages/peer-id/tsconfig.json +++ b/packages/peer-id/tsconfig.json @@ -4,7 +4,8 @@ "outDir": "dist" }, "include": [ - "src" + "src", + "test" ], "references": [ { diff --git a/packages/peer-record/tsconfig.json b/packages/peer-record/tsconfig.json index e92a104111..3052d247ba 100644 --- a/packages/peer-record/tsconfig.json +++ b/packages/peer-record/tsconfig.json @@ -4,7 +4,8 @@ "outDir": "dist" }, "include": [ - "src" + "src", + "test" ], "references": [ { diff --git a/packages/peer-store/tsconfig.json b/packages/peer-store/tsconfig.json index 9134078d6c..7520207294 100644 --- a/packages/peer-store/tsconfig.json +++ b/packages/peer-store/tsconfig.json @@ -4,7 +4,8 @@ "outDir": "dist" }, "include": [ - "src" + "src", + "test" ], "exclude": [ "src/pb/peer.js" diff --git a/packages/protocol-perf/tsconfig.json b/packages/protocol-perf/tsconfig.json index b29c2409a7..441774e960 100644 --- a/packages/protocol-perf/tsconfig.json +++ b/packages/protocol-perf/tsconfig.json @@ -4,7 +4,8 @@ "outDir": "dist" }, "include": [ - "src" + "src", + "test" ], "references": [ { diff --git a/packages/pubsub-floodsub/tsconfig.json b/packages/pubsub-floodsub/tsconfig.json index 6891ae64ce..22dbd7db0d 100644 --- a/packages/pubsub-floodsub/tsconfig.json +++ b/packages/pubsub-floodsub/tsconfig.json @@ -4,7 +4,8 @@ "outDir": "dist" }, "include": [ - "src" + "src", + "test" ], "references": [ { diff --git a/packages/pubsub/tsconfig.json b/packages/pubsub/tsconfig.json index d7227c9f02..4061e84433 100644 --- a/packages/pubsub/tsconfig.json +++ b/packages/pubsub/tsconfig.json @@ -4,7 +4,8 @@ "outDir": "dist" }, "include": [ - "src" + "src", + "test" ], "exclude": [ "test/message/rpc.js" diff --git a/packages/stream-multiplexer-mplex/tsconfig.json b/packages/stream-multiplexer-mplex/tsconfig.json index afe39e140d..c1ac576e1b 100644 --- a/packages/stream-multiplexer-mplex/tsconfig.json +++ b/packages/stream-multiplexer-mplex/tsconfig.json @@ -4,7 +4,8 @@ "outDir": "dist" }, "include": [ - "src" + "src", + "test" ], "references": [ { diff --git a/packages/transport-tcp/tsconfig.json b/packages/transport-tcp/tsconfig.json index d34296762c..b5b8e9d6e1 100644 --- a/packages/transport-tcp/tsconfig.json +++ b/packages/transport-tcp/tsconfig.json @@ -4,7 +4,8 @@ "outDir": "dist" }, "include": [ - "src" + "src", + "test" ], "references": [ { diff --git a/packages/transport-webrtc/tsconfig.json b/packages/transport-webrtc/tsconfig.json index 3440eab5e8..4008808465 100644 --- a/packages/transport-webrtc/tsconfig.json +++ b/packages/transport-webrtc/tsconfig.json @@ -5,6 +5,7 @@ }, "include": [ "src", + "test", "proto_ts" ], "references": [ diff --git a/packages/transport-websockets/tsconfig.json b/packages/transport-websockets/tsconfig.json index d34296762c..b5b8e9d6e1 100644 --- a/packages/transport-websockets/tsconfig.json +++ b/packages/transport-websockets/tsconfig.json @@ -4,7 +4,8 @@ "outDir": "dist" }, "include": [ - "src" + "src", + "test" ], "references": [ { diff --git a/packages/transport-webtransport/tsconfig.json b/packages/transport-webtransport/tsconfig.json index 0f9733b638..0344702f51 100644 --- a/packages/transport-webtransport/tsconfig.json +++ b/packages/transport-webtransport/tsconfig.json @@ -4,7 +4,8 @@ "outDir": "dist" }, "include": [ - "src" + "src", + "test" ], "references": [ { diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json index c4f39b4624..b382e52ffe 100644 --- a/packages/utils/tsconfig.json +++ b/packages/utils/tsconfig.json @@ -4,7 +4,8 @@ "outDir": "dist" }, "include": [ - "src" + "src", + "test" ], "references": [ { From 1a2e5e001addcb4dd541d4061fa2c26a8e80f857 Mon Sep 17 00:00:00 2001 From: chad Date: Fri, 13 Oct 2023 22:39:12 -0500 Subject: [PATCH 5/5] chore: updated workflow for tests --- .github/workflows/main.yml | 84 +++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2203d8ce2e..a354658173 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,30 +5,31 @@ on: - master pull_request: branches: - - "**" + - '**' jobs: + build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: lts/* - - run: npm i - - run: npm run build + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: lts/* + - uses: ipfs/aegir/actions/cache-node-modules@master check: needs: build runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: lts/* - - run: npm run --if-present lint - - run: npm run --if-present dep-check - - run: npm run --if-present doc-check + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: lts/* + - uses: ipfs/aegir/actions/cache-node-modules@master + - run: npm run --if-present lint + - run: npm run --if-present dep-check + - run: npm run --if-present doc-check test-node: needs: build @@ -43,7 +44,7 @@ jobs: - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node }} - + - uses: ipfs/aegir/actions/cache-node-modules@master - run: npm run --if-present test:node - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0 with: @@ -58,7 +59,7 @@ jobs: - uses: actions/setup-node@v3 with: node-version: lts/* - + - uses: ipfs/aegir/actions/cache-node-modules@master - run: npm run --if-present test:chrome - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0 with: @@ -73,7 +74,7 @@ jobs: - uses: actions/setup-node@v3 with: node-version: lts/* - + - uses: ipfs/aegir/actions/cache-node-modules@master - run: npm run --if-present test:chrome-webworker - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0 with: @@ -88,7 +89,7 @@ jobs: - uses: actions/setup-node@v3 with: node-version: lts/* - + - uses: ipfs/aegir/actions/cache-node-modules@master - run: npm run --if-present test:firefox - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0 with: @@ -103,7 +104,7 @@ jobs: - uses: actions/setup-node@v3 with: node-version: lts/* - + - uses: ipfs/aegir/actions/cache-node-modules@master - run: npm run --if-present test:firefox-webworker - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0 with: @@ -118,7 +119,7 @@ jobs: - uses: actions/setup-node@v3 with: node-version: lts/* - + - uses: ipfs/aegir/actions/cache-node-modules@master - run: npx playwright install-deps - run: npm run --if-present test:webkit - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0 @@ -134,7 +135,7 @@ jobs: - uses: actions/setup-node@v3 with: node-version: lts/* - + - uses: ipfs/aegir/actions/cache-node-modules@master - run: npx xvfb-maybe npm run --if-present test:electron-main - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0 with: @@ -149,7 +150,7 @@ jobs: - uses: actions/setup-node@v3 with: node-version: lts/* - + - uses: ipfs/aegir/actions/cache-node-modules@master - run: npx xvfb-maybe npm run --if-present test:electron-renderer - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0 with: @@ -164,7 +165,7 @@ jobs: - uses: actions/setup-node@v3 with: node-version: lts/* - + - uses: ipfs/aegir/actions/cache-node-modules@master - run: npm run test:interop -- --bail test-examples: @@ -175,7 +176,7 @@ jobs: - uses: actions/setup-node@v3 with: node-version: lts/* - + - uses: ipfs/aegir/actions/cache-node-modules@master - run: npm run --if-present test:example transport-interop: @@ -186,7 +187,7 @@ jobs: - uses: actions/setup-node@v3 with: node-version: lts/* - + - uses: ipfs/aegir/actions/cache-node-modules@master - name: Build images run: (cd interop && make -j 4) - name: Save package-lock.json as artifact @@ -208,19 +209,18 @@ jobs: release: runs-on: ubuntu-latest - needs: - [ - test-node, - test-chrome, - test-chrome-webworker, - test-firefox, - test-firefox-webworker, - test-electron-main, - test-electron-renderer, - test-interop, - test-examples, - transport-interop, - ] + needs: [ + test-node, + test-chrome, + test-chrome-webworker, + test-firefox, + test-firefox-webworker, + test-electron-main, + test-electron-renderer, + test-interop, + test-examples, + transport-interop + ] if: github.event_name == 'push' && github.ref == 'refs/heads/master' steps: - uses: GoogleCloudPlatform/release-please-action@v2 @@ -246,8 +246,8 @@ jobs: - uses: actions/setup-node@v3 with: node-version: lts/* - registry-url: "https://registry.npmjs.org" - + registry-url: 'https://registry.npmjs.org' + - uses: ipfs/aegir/actions/cache-node-modules@master - uses: ipfs/aegir/actions/docker-login@master with: docker-token: ${{ secrets.DOCKER_TOKEN }} @@ -263,8 +263,8 @@ jobs: - if: ${{ !steps.release.outputs.releases_created }} name: Run release rc run: | - git update-index --assume-unchanged packages/libp2p/src/version.ts - npm run --if-present release:rc + git update-index --assume-unchanged packages/libp2p/src/version.ts + npm run --if-present release:rc env: GITHUB_TOKEN: ${{ secrets.UCI_GITHUB_TOKEN || github.token }} NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}