diff --git a/.github/workflows/interop-test.yml b/.github/workflows/interop-test.yml index 5d97ba3058..1399cf040d 100644 --- a/.github/workflows/interop-test.yml +++ b/.github/workflows/interop-test.yml @@ -29,7 +29,7 @@ jobs: - uses: libp2p/test-plans/.github/actions/run-interop-ping-test@master with: test-filter: js-libp2p-head - 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 }} diff --git a/interop/BrowserDockerfile b/interop/BrowserDockerfile index aa6f0077be..33a03b9a46 100644 --- a/interop/BrowserDockerfile +++ b/interop/BrowserDockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM mcr.microsoft.com/playwright +FROM mcr.microsoft.com/playwright:v1.33.0-focal COPY --from=node-js-libp2p-head /app/ /app/ WORKDIR /app/interop diff --git a/interop/Makefile b/interop/Makefile index 5befb5a83e..a2d582f783 100644 --- a/interop/Makefile +++ b/interop/Makefile @@ -1,9 +1,7 @@ image_name := js-libp2p-head TEST_SOURCES := $(wildcard test/*.ts) -# Enable webkit once https://github.com/libp2p/js-libp2p/pull/1627 is in -# all: node-image.json webkit-image.json firefox-image.json chromium-image.json -all: node-image.json firefox-image.json chromium-image.json +all: node-image.json webkit-image.json firefox-image.json chromium-image.json node-image.json: Dockerfile $(TEST_SOURCES) package.json .aegir.js cd .. && docker build -f interop/Dockerfile -t node-${image_name} . diff --git a/interop/webkit-version.json b/interop/webkit-version.json index 04cfbd0f04..832e470aeb 100644 --- a/interop/webkit-version.json +++ b/interop/webkit-version.json @@ -1,7 +1,17 @@ { "id": "webkit-js-libp2p-head", "containerImageID": "webkit-js-libp2p-head", - "transports": [], + "transports": [ + { + "name": "webrtc-direct", + "onlyDial": true + }, + "webrtc", + { + "name": "wss", + "onlyDial": true + } + ], "secureChannels": [ "noise" ], @@ -9,4 +19,4 @@ "mplex", "yamux" ] -} \ No newline at end of file +}