From 0af4e92b6534e96a0532377357759d8cf77f5196 Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Thu, 16 Nov 2023 11:49:50 +1100 Subject: [PATCH 1/3] Add Rust v0.53 release --- .../impl/rust-chromium/v0.53/Makefile | 20 +++++++++++++ transport-interop/impl/rust/v0.53/Makefile | 20 +++++++++++++ transport-interop/versions.ts | 29 ++++++++++++++----- 3 files changed, 62 insertions(+), 7 deletions(-) create mode 100644 transport-interop/impl/rust-chromium/v0.53/Makefile create mode 100644 transport-interop/impl/rust/v0.53/Makefile diff --git a/transport-interop/impl/rust-chromium/v0.53/Makefile b/transport-interop/impl/rust-chromium/v0.53/Makefile new file mode 100644 index 000000000..b4ebee1a0 --- /dev/null +++ b/transport-interop/impl/rust-chromium/v0.53/Makefile @@ -0,0 +1,20 @@ +image_name := rust-v0.53 +commitSha := caf9da4a69f1cce8183d4b17c792476ee44c37bc + +all: image.json + +image.json: rust-libp2p-${commitSha} + cd rust-libp2p-${commitSha} && IMAGE_NAME=${image_name} ../../../../dockerBuildWrapper.sh -f interop-tests/Dockerfile.chromium . + docker image inspect ${image_name} -f "{{.Id}}" | \ + xargs -I {} echo "{\"imageID\": \"{}\"}" > $@ + +rust-libp2p-${commitSha}: rust-libp2p-${commitSha}.zip + unzip -o rust-libp2p-${commitSha}.zip + +rust-libp2p-${commitSha}.zip: + wget -O $@ "https://github.com/libp2p/rust-libp2p/archive/${commitSha}.zip" + +clean: + rm image.json + rm rust-libp2p-*.zip + rm -rf rust-libp2p-* diff --git a/transport-interop/impl/rust/v0.53/Makefile b/transport-interop/impl/rust/v0.53/Makefile new file mode 100644 index 000000000..f77b8c430 --- /dev/null +++ b/transport-interop/impl/rust/v0.53/Makefile @@ -0,0 +1,20 @@ +image_name := rust-v0.53 +commitSha := caf9da4a69f1cce8183d4b17c792476ee44c37bc + +all: image.json + +image.json: rust-libp2p-${commitSha} + cd rust-libp2p-${commitSha} && IMAGE_NAME=${image_name} ../../../../dockerBuildWrapper.sh -f interop-tests/Dockerfile.native . + docker image inspect ${image_name} -f "{{.Id}}" | \ + xargs -I {} echo "{\"imageID\": \"{}\"}" > $@ + +rust-libp2p-${commitSha}: rust-libp2p-${commitSha}.zip + unzip -o rust-libp2p-${commitSha}.zip + +rust-libp2p-${commitSha}.zip: + wget -O $@ "https://github.com/libp2p/rust-libp2p/archive/${commitSha}.zip" + +clean: + rm image.json + rm rust-libp2p-*.zip + rm -rf rust-libp2p-* diff --git a/transport-interop/versions.ts b/transport-interop/versions.ts index d67dce33e..36acf0937 100644 --- a/transport-interop/versions.ts +++ b/transport-interop/versions.ts @@ -62,13 +62,28 @@ export const versions: Array = [ secureChannels: ["tls", "noise"], muxers: ["mplex", "yamux"], }, - // Re-enable when we figure out the glibc mismatch issue: https://github.com/libp2p/test-plans/pull/342 - // { - // id: "rust-chromium-v0.52", - // transports: [{ name: "webtransport", onlyDial: true }], - // secureChannels: [], - // muxers: [], - // }, + { + id: "rust-v0.53", + transports: ["ws", "tcp", "quic-v1", "webrtc-direct"], + secureChannels: ["tls", "noise"], + muxers: ["mplex", "yamux"], + }, + { + id: "rust-chromium-v0.52", + transports: [{ name: "webtransport", onlyDial: true }], + secureChannels: [], + muxers: [], + }, + { + id: "rust-chromium-v0.53", + "transports": [ + { "name": "webtransport", "onlyDial": true }, + { "name": "webrtc-direct", "onlyDial": true }, + { "name": "ws", "onlyDial": true } + ], + "secureChannels": ["noise"], + "muxers": ["mplex", "yamux"] + }, { id: "js-v0.45", transports: ["tcp", "ws", { name: "wss", onlyDial: true }], From b0a0c4100873ba00fb181d74f19f6ebd44060e08 Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Tue, 23 Jan 2024 21:47:22 -0800 Subject: [PATCH 2/3] Update to v0.53.2 --- transport-interop/impl/rust-chromium/v0.52/Makefile | 2 +- transport-interop/impl/rust-chromium/v0.53/Makefile | 4 ++-- transport-interop/impl/rust/v0.53/Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/transport-interop/impl/rust-chromium/v0.52/Makefile b/transport-interop/impl/rust-chromium/v0.52/Makefile index 43fd11eb8..551b7018f 100644 --- a/transport-interop/impl/rust-chromium/v0.52/Makefile +++ b/transport-interop/impl/rust-chromium/v0.52/Makefile @@ -1,4 +1,4 @@ -image_name := rust-v0.52 +image_name := rust-chromium-v0.52 # BROKEN because glibc does not match. commitSha := f1bfe8d4ed423d03df4ef477072178e953c85f45 diff --git a/transport-interop/impl/rust-chromium/v0.53/Makefile b/transport-interop/impl/rust-chromium/v0.53/Makefile index b4ebee1a0..76883457a 100644 --- a/transport-interop/impl/rust-chromium/v0.53/Makefile +++ b/transport-interop/impl/rust-chromium/v0.53/Makefile @@ -1,5 +1,5 @@ -image_name := rust-v0.53 -commitSha := caf9da4a69f1cce8183d4b17c792476ee44c37bc +image_name := rust-chromium-v0.53 +commitSha := b7914e407da34c99fb76dcc300b3d44b9af97fac all: image.json diff --git a/transport-interop/impl/rust/v0.53/Makefile b/transport-interop/impl/rust/v0.53/Makefile index f77b8c430..999f464d5 100644 --- a/transport-interop/impl/rust/v0.53/Makefile +++ b/transport-interop/impl/rust/v0.53/Makefile @@ -1,5 +1,5 @@ image_name := rust-v0.53 -commitSha := caf9da4a69f1cce8183d4b17c792476ee44c37bc +commitSha := b7914e407da34c99fb76dcc300b3d44b9af97fac all: image.json From d24ebf626ae07641386f0d5dcb1ffa748b432d97 Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Wed, 24 Jan 2024 13:18:46 -0800 Subject: [PATCH 3/3] Comment out v0.52 chromium --- transport-interop/versions.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/transport-interop/versions.ts b/transport-interop/versions.ts index 36acf0937..3c134f08c 100644 --- a/transport-interop/versions.ts +++ b/transport-interop/versions.ts @@ -68,12 +68,12 @@ export const versions: Array = [ secureChannels: ["tls", "noise"], muxers: ["mplex", "yamux"], }, - { - id: "rust-chromium-v0.52", - transports: [{ name: "webtransport", onlyDial: true }], - secureChannels: [], - muxers: [], - }, + // { + // id: "rust-chromium-v0.52", + // transports: [{ name: "webtransport", onlyDial: true }], + // secureChannels: [], + // muxers: [], + // }, { id: "rust-chromium-v0.53", "transports": [