From 0a695814f1e7c6c7a8997624a401b45898b6f7ae Mon Sep 17 00:00:00 2001 From: chad Date: Fri, 10 May 2024 21:46:12 -0500 Subject: [PATCH 1/4] ci: enable webkit tests in interop and webRTC --- interop/webkit-version.json | 27 +++++++++++++++----------- packages/transport-webrtc/package.json | 1 + 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/interop/webkit-version.json b/interop/webkit-version.json index 04cfbd0f04..7322778572 100644 --- a/interop/webkit-version.json +++ b/interop/webkit-version.json @@ -1,12 +1,17 @@ { - "id": "webkit-js-libp2p-head", - "containerImageID": "webkit-js-libp2p-head", - "transports": [], - "secureChannels": [ - "noise" - ], - "muxers": [ - "mplex", - "yamux" - ] -} \ No newline at end of file + "id": "webkit-js-libp2p-head", + "containerImageID": "webkit-js-libp2p-head", + "transports": [ + { + "name": "webrtc-direct", + "onlyDial": true + }, + "webrtc", + { + "name": "wss", + "onlyDial": true + } + ], + "secureChannels": ["noise"], + "muxers": ["mplex", "yamux"] +} diff --git a/packages/transport-webrtc/package.json b/packages/transport-webrtc/package.json index 65b892fa36..ed74a1feaa 100644 --- a/packages/transport-webrtc/package.json +++ b/packages/transport-webrtc/package.json @@ -43,6 +43,7 @@ "test:node": "aegir test -t node --cov", "test:chrome": "aegir test -t browser --cov", "test:firefox": "aegir test -t browser -- --browser firefox", + "test:webkit": "aegir test -t browser -- --browser webkit", "lint": "aegir lint", "lint:fix": "aegir lint --fix", "clean": "aegir clean", From bdccd6a3b45b69f0ec173bc999ecda38501bd327 Mon Sep 17 00:00:00 2001 From: chad Date: Tue, 14 May 2024 09:51:01 -0500 Subject: [PATCH 2/4] chore: add test:webkit to root package.json --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index c90f6c85ee..41a97dc8a3 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "test:firefox": "aegir run test:firefox", "test:firefox-webworker": "aegir run test:firefox-webworker", "test:electron-main": "aegir run test:electron-main", + "test:webkit": "aegir run test:webkit", "test:cli": "aegir run test:cli", "test:interop": "aegir run test:interop", "coverage": "aegir run coverage", From 589ef13746df80ba6fb26b1dda9855f1e52d20b2 Mon Sep 17 00:00:00 2001 From: chad Date: Tue, 14 May 2024 15:33:38 -0500 Subject: [PATCH 3/4] ci: add webkit to interop workflow --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e7423281bd..1cc39551f5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -219,7 +219,7 @@ jobs: 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 + extra-versions: ${{ github.workspace }}/interop/node-version.json ${{ github.workspace }}/interop/chromium-version.json ${{ github.workspace }}/interop/firefox-version.json ${{ github.workspace }}/interop/webkit-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 }} From 12e92369c62866669624bc289f29a7c6e045a533 Mon Sep 17 00:00:00 2001 From: chad Date: Tue, 14 May 2024 16:04:23 -0500 Subject: [PATCH 4/4] ci: add webtransport --- interop/webkit-version.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/interop/webkit-version.json b/interop/webkit-version.json index 7322778572..69be406e44 100644 --- a/interop/webkit-version.json +++ b/interop/webkit-version.json @@ -2,6 +2,10 @@ "id": "webkit-js-libp2p-head", "containerImageID": "webkit-js-libp2p-head", "transports": [ + { + "name": "webtransport", + "onlyDial": true + }, { "name": "webrtc-direct", "onlyDial": true