Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: Add WebKit to interop tester #1799

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/interop-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
2 changes: 1 addition & 1 deletion interop/BrowserDockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 1 addition & 3 deletions interop/Makefile
Original file line number Diff line number Diff line change
@@ -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} .
Expand Down
14 changes: 12 additions & 2 deletions interop/webkit-version.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,22 @@
{
"id": "webkit-js-libp2p-head",
"containerImageID": "webkit-js-libp2p-head",
"transports": [],
"transports": [
{
"name": "webrtc-direct",
"onlyDial": true
},
"webrtc",
{
"name": "wss",
"onlyDial": true
}
],
"secureChannels": [
"noise"
],
"muxers": [
"mplex",
"yamux"
]
}
}