From e79c69385d59a42ea8188bb9aa9168761208759d Mon Sep 17 00:00:00 2001 From: Prithvi Shahi Date: Mon, 21 Aug 2023 20:06:46 -0700 Subject: [PATCH 1/2] chore: add go-libp2p v0.30 and remove v0.27 and v0.28 --- multidim-interop/impl/go/v0.30/Makefile | 32 +++++++++++++++++++++ multidim-interop/impl/go/v0.30/version.lock | 1 + multidim-interop/versions.ts | 10 ++----- 3 files changed, 35 insertions(+), 8 deletions(-) create mode 100644 multidim-interop/impl/go/v0.30/Makefile create mode 100644 multidim-interop/impl/go/v0.30/version.lock diff --git a/multidim-interop/impl/go/v0.30/Makefile b/multidim-interop/impl/go/v0.30/Makefile new file mode 100644 index 000000000..67b913a6f --- /dev/null +++ b/multidim-interop/impl/go/v0.30/Makefile @@ -0,0 +1,32 @@ +image_name := go-v0.30 +version := 0.30.0 + +all: image.json + +image.json: verify-checksum go-libp2p-${version} + cd go-libp2p-${version} && IMAGE_NAME=${image_name} ../../../../dockerBuildWrapper.sh -f test-plans/PingDockerfile . + docker image inspect ${image_name} -f "{{.Id}}" | \ + xargs -I {} echo "{\"imageID\": \"{}\"}" > $@ + +go-libp2p-${version}: go-libp2p-${version}.zip + unzip -o go-libp2p-${version}.zip + +go-libp2p-${version}.zip: + wget -O $@ "https://github.com/libp2p/go-libp2p/archive/v${version}.zip" + +# Run `make version.lock` to generate this lock file. This file should be commited. +# This locks the exact contents of the specified version. This lets us use the +# human readable name while still making sure the contents don't change. +version.lock: go-libp2p-${version}.zip + shasum -a 256 go-libp2p-${version}.zip > $@ + +verify-checksum: go-libp2p-${version}.zip + shasum -a 256 -c version.lock + +.PHONY: clean all verify-checksum + +clean: + rm image.json + rm go-libp2p-*.zip + rm -rf go-libp2p-* + diff --git a/multidim-interop/impl/go/v0.30/version.lock b/multidim-interop/impl/go/v0.30/version.lock new file mode 100644 index 000000000..4a4bba573 --- /dev/null +++ b/multidim-interop/impl/go/v0.30/version.lock @@ -0,0 +1 @@ +ce648ef713f6c68f9edf88e725605702ceb665ddc4c8a1b528f738a8689db1f3 go-libp2p-0.30.0.zip diff --git a/multidim-interop/versions.ts b/multidim-interop/versions.ts index 6fe53b119..01ac061f4 100644 --- a/multidim-interop/versions.ts +++ b/multidim-interop/versions.ts @@ -96,19 +96,13 @@ export const versions: Array = [ muxers: ["mplex", "yamux"], }, { - id: "go-v0.29", + id: "go-v0.30", transports: ["tcp", "ws", "quic", "quic-v1", "webtransport"], secureChannels: ["tls", "noise"], muxers: ["mplex", "yamux"], }, { - id: "go-v0.28", - transports: ["tcp", "ws", "quic", "quic-v1", "webtransport"], - secureChannels: ["tls", "noise"], - muxers: ["mplex", "yamux"], - }, - { - id: "go-v0.27", + id: "go-v0.29", transports: ["tcp", "ws", "quic", "quic-v1", "webtransport"], secureChannels: ["tls", "noise"], muxers: ["mplex", "yamux"], From 0411e371781cd4b02cbe23245df64b9ed378dbb8 Mon Sep 17 00:00:00 2001 From: Prithvi Shahi Date: Mon, 21 Aug 2023 20:32:30 -0700 Subject: [PATCH 2/2] remove quic and mplex in v0.30 --- multidim-interop/versions.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/multidim-interop/versions.ts b/multidim-interop/versions.ts index 01ac061f4..e60f54950 100644 --- a/multidim-interop/versions.ts +++ b/multidim-interop/versions.ts @@ -97,9 +97,9 @@ export const versions: Array = [ }, { id: "go-v0.30", - transports: ["tcp", "ws", "quic", "quic-v1", "webtransport"], + transports: ["tcp", "ws", "quic-v1", "webtransport"], secureChannels: ["tls", "noise"], - muxers: ["mplex", "yamux"], + muxers: ["yamux"], }, { id: "go-v0.29",