From 22f37a0e93bb122e3a51cacac95d2a4ab0c75521 Mon Sep 17 00:00:00 2001 From: Marco Munizaga Date: Fri, 2 Jun 2023 09:21:20 -0700 Subject: [PATCH] Revert "Add js-libp2p v0.45.0 (#187)" (#188) This reverts commit e9f496236284c82cb3a4c9bf2b4d4258e1019f09. --- multidim-interop/impl/js/.gitignore | 3 -- .../impl/js/v0.45/BrowserDockerfile | 18 ----------- multidim-interop/impl/js/v0.45/Dockerfile | 11 ------- multidim-interop/impl/js/v0.45/Makefile | 30 ------------------- multidim-interop/versions.ts | 25 ---------------- 5 files changed, 87 deletions(-) delete mode 100644 multidim-interop/impl/js/v0.45/BrowserDockerfile delete mode 100644 multidim-interop/impl/js/v0.45/Dockerfile delete mode 100644 multidim-interop/impl/js/v0.45/Makefile diff --git a/multidim-interop/impl/js/.gitignore b/multidim-interop/impl/js/.gitignore index ee2c6aed5..0842bf478 100644 --- a/multidim-interop/impl/js/.gitignore +++ b/multidim-interop/impl/js/.gitignore @@ -1,4 +1 @@ *image.json -js-libp2p-*.zip -js-libp2p-* -js-libp2p-*/* diff --git a/multidim-interop/impl/js/v0.45/BrowserDockerfile b/multidim-interop/impl/js/v0.45/BrowserDockerfile deleted file mode 100644 index f73ca41a1..000000000 --- a/multidim-interop/impl/js/v0.45/BrowserDockerfile +++ /dev/null @@ -1,18 +0,0 @@ -# syntax=docker/dockerfile:1 - -# Copied since we won't have the repo to use if expanding from cache. - -# Workaround: https://github.com/docker/cli/issues/996 -ARG BASE_IMAGE=node-js-libp2p-head -FROM ${BASE_IMAGE} as js-libp2p-base - -FROM mcr.microsoft.com/playwright - - -COPY --from=js-libp2p-base /app/ /app/ -WORKDIR /app/interop -RUN ./node_modules/.bin/playwright install -ARG BROWSER=chromium # Options: chromium, firefox, webkit -ENV BROWSER=$BROWSER - -ENTRYPOINT npm test -- --build false --types false -t browser -- --browser $BROWSER diff --git a/multidim-interop/impl/js/v0.45/Dockerfile b/multidim-interop/impl/js/v0.45/Dockerfile deleted file mode 100644 index 40e67d678..000000000 --- a/multidim-interop/impl/js/v0.45/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -# Here because we want to fetch the node_modules within docker so that it's -# installed on the same platform the test is run. Otherwise tools like `esbuild` will fail to run -FROM node:18 -WORKDIR /app -COPY . . -RUN npm i && npm run build - -WORKDIR /app/interop -RUN npm i && npm run build - -ENTRYPOINT [ "npm", "test", "--", "--build", "false", "--types", "false", "-t", "node" ] diff --git a/multidim-interop/impl/js/v0.45/Makefile b/multidim-interop/impl/js/v0.45/Makefile deleted file mode 100644 index d1186f394..000000000 --- a/multidim-interop/impl/js/v0.45/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -image_name := js-v0.45 -commitSha := 41641f1a7656aa654234f6f849b1749786867121 - -# TODO Enable webkit once https://github.com/libp2p/js-libp2p/pull/1627 is in -all: image.json chromium-image.json firefox-image.json - -chromium-image.json: image.json BrowserDockerfile - docker build -f BrowserDockerfile --build-arg=BASE_IMAGE=${image_name} --build-arg=BROWSER=chromium -t chromium-${image_name} . - docker image inspect chromium-${image_name} -f "{{.Id}}" | \ - xargs -I {} echo "{\"imageID\": \"{}\"}" > $@ - -firefox-image.json: image.json BrowserDockerfile - docker build -f BrowserDockerfile --build-arg=BASE_IMAGE=${image_name} --build-arg=BROWSER=firefox -t firefox-${image_name} . - docker image inspect firefox-${image_name} -f "{{.Id}}" | \ - xargs -I {} echo "{\"imageID\": \"{}\"}" > $@ - -image.json: js-libp2p-${commitSha} - cd js-libp2p-${commitSha} && docker build -t ${image_name} -f ../Dockerfile . - docker image inspect ${image_name} -f "{{.Id}}" | \ - xargs -I {} echo "{\"imageID\": \"{}\"}" > $@ - -js-libp2p-${commitSha}: - wget -O js-libp2p-${commitSha}.zip "https://github.com/libp2p/js-libp2p/archive/${commitSha}.zip" - unzip -o js-libp2p-${commitSha}.zip - unzip -o js-libp2p-${commitSha}.zip - -clean: - rm -rf image.json js-libp2p-*.zip js-libp2p-* *-image.json - -.PHONY: all clean browser-images diff --git a/multidim-interop/versions.ts b/multidim-interop/versions.ts index 7573b474d..0f9d21953 100644 --- a/multidim-interop/versions.ts +++ b/multidim-interop/versions.ts @@ -11,13 +11,10 @@ import rustv051 from "./impl/rust/v0.51/image.json" import jsV041 from "./impl/js/v0.41/node-image.json" import jsV042 from "./impl/js/v0.42/node-image.json" import jsV044 from "./impl/js/v0.44/node-image.json" -import jsV045 from "./impl/js/v0.45/image.json" import nimv10 from "./impl/nim/v1.0/image.json" import chromiumJsV041 from "./impl/js/v0.41/chromium-image.json" import chromiumJsV042 from "./impl/js/v0.42/chromium-image.json" import chromiumJsV044 from "./impl/js/v0.44/chromium-image.json" -import chromiumJsV045 from "./impl/js/v0.45/chromium-image.json" -import firefoxJsV045 from "./impl/js/v0.45/firefox-image.json" import zigv001 from "./impl/zig/v0.0.1/image.json" export type Version = { @@ -80,13 +77,6 @@ export const versions: Array = [ secureChannels: ["noise"], muxers: ["mplex", "yamux"], }, - { - id: "js-v0.45.0", - containerImageID: jsV045.imageID, - transports: ["tcp", "ws", { name: "wss", onlyDial: true }], - secureChannels: ["noise"], - muxers: ["mplex", "yamux"], - }, { id: "chromium-js-v0.41.0", containerImageID: chromiumJsV041.imageID, @@ -108,21 +98,6 @@ export const versions: Array = [ secureChannels: ["noise"], muxers: ["mplex", "yamux"], }, - // TODO enable webrtc direct for v0.45 - { - id: "chromium-js-v0.45.0", - containerImageID: chromiumJsV045.imageID, - transports: [{ name: "webtransport", onlyDial: true }, { name: "wss", onlyDial: true }], - secureChannels: ["noise"], - muxers: ["mplex", "yamux"], - }, - { - id: "firefox-js-v0.45.0", - containerImageID: firefoxJsV045.imageID, - transports: [{ name: "wss", onlyDial: true }], - secureChannels: ["noise"], - muxers: ["mplex", "yamux"], - }, { id: "go-v0.27.1", containerImageID: gov027.imageID,