From da62ebc9797027e32cb8c20e64aa109065eed508 Mon Sep 17 00:00:00 2001 From: Prithvi Shahi Date: Fri, 11 Aug 2023 12:17:07 -0700 Subject: [PATCH] chore: rm rust-libp2p v0.49 and v0.50, update v0.52 (#253) --- multidim-interop/impl/rust/v0.49/Makefile | 20 ------------- multidim-interop/impl/rust/v0.50/Makefile | 20 ------------- multidim-interop/impl/rust/v0.52/Makefile | 30 +++++++++++++------ multidim-interop/impl/rust/v0.52/version.lock | 1 + multidim-interop/versions.ts | 12 -------- 5 files changed, 22 insertions(+), 61 deletions(-) delete mode 100644 multidim-interop/impl/rust/v0.49/Makefile delete mode 100644 multidim-interop/impl/rust/v0.50/Makefile create mode 100644 multidim-interop/impl/rust/v0.52/version.lock diff --git a/multidim-interop/impl/rust/v0.49/Makefile b/multidim-interop/impl/rust/v0.49/Makefile deleted file mode 100644 index 69c40a9..0000000 --- a/multidim-interop/impl/rust/v0.49/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -image_name := rust-v0.49 -commitSha := 45e3f9c61ad6de18e3e28ca2810a65668d6bba8d - -all: image.json - -image.json: rust-libp2p-${commitSha} - cd rust-libp2p-${commitSha} && IMAGE_NAME=${image_name} ../../../../dockerBuildWrapper.sh -f interop-tests/Dockerfile . - 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/multidim-interop/impl/rust/v0.50/Makefile b/multidim-interop/impl/rust/v0.50/Makefile deleted file mode 100644 index 27dbf62..0000000 --- a/multidim-interop/impl/rust/v0.50/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -image_name := rust-v0.50 -commitSha := 97071b9a8e0dbd2d2526400169eaa30f317e9d62 - -all: image.json - -image.json: rust-libp2p-${commitSha} - cd rust-libp2p-${commitSha} && IMAGE_NAME=${image_name} ../../../../dockerBuildWrapper.sh -f interop-tests/Dockerfile . - 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/multidim-interop/impl/rust/v0.52/Makefile b/multidim-interop/impl/rust/v0.52/Makefile index 0e4976c..c180667 100644 --- a/multidim-interop/impl/rust/v0.52/Makefile +++ b/multidim-interop/impl/rust/v0.52/Makefile @@ -1,23 +1,35 @@ image_name := rust-v0.52 -commitSha := 68e6bf9c3cd0d3317415a5ba31a62e91cba0a5d2 +version := 0.52.2 all: image.json chromium-image.json -chromium-image.json: rust-libp2p-${commitSha} - cd rust-libp2p-${commitSha} && IMAGE_NAME=${image_name} ../../../../dockerBuildWrapper.sh -f interop-tests/Dockerfile.chromium . +chromium-image.json: verify-checksum rust-libp2p-${version} + cd rust-libp2p-${version} && IMAGE_NAME=${image_name} ../../../../dockerBuildWrapper.sh -f interop-tests/Dockerfile.chromium . docker image inspect ${image_name} -f "{{.Id}}" | \ xargs -I {} echo "{\"imageID\": \"{}\"}" > $@ -image.json: rust-libp2p-${commitSha} - cd rust-libp2p-${commitSha} && IMAGE_NAME=${image_name} ../../../../dockerBuildWrapper.sh -f interop-tests/Dockerfile.native . +image.json: verify-checksum rust-libp2p-${version} + cd rust-libp2p-${version} && 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-${version}: rust-libp2p-${version}.zip + unzip -o rust-libp2p-${version}.zip + mv rust-libp2p-libp2p-v${version} rust-libp2p-${version} -rust-libp2p-${commitSha}.zip: - wget -O $@ "https://github.com/libp2p/rust-libp2p/archive/${commitSha}.zip" +rust-libp2p-${version}.zip: + wget -O $@ "https://github.com/libp2p/rust-libp2p/archive/libp2p-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: rust-libp2p-${version}.zip + shasum -a 256 rust-libp2p-${version}.zip > $@ + +verify-checksum: rust-libp2p-${version}.zip + shasum -a 256 -c version.lock + +.PHONY: clean all verify-checksum clean: rm image.json diff --git a/multidim-interop/impl/rust/v0.52/version.lock b/multidim-interop/impl/rust/v0.52/version.lock new file mode 100644 index 0000000..a0b372a --- /dev/null +++ b/multidim-interop/impl/rust/v0.52/version.lock @@ -0,0 +1 @@ +d6235033673b133eead02b40ec56cb913da454c4113696d1e63283550aef9155 rust-libp2p-0.52.2.zip diff --git a/multidim-interop/versions.ts b/multidim-interop/versions.ts index 4d57aa2..109830f 100644 --- a/multidim-interop/versions.ts +++ b/multidim-interop/versions.ts @@ -50,18 +50,6 @@ function browserImageIDLookup(id: string): string { } export const versions: Array = [ - { - id: "rust-v0.49", - transports: ["ws", "tcp"], - secureChannels: ["noise"], - muxers: ["mplex", "yamux"], - }, - { - id: "rust-v0.50", - transports: ["ws", "tcp", "quic-v1"], - secureChannels: ["tls", "noise"], - muxers: ["mplex", "yamux"], - }, { id: "rust-v0.51", transports: ["ws", "tcp", "quic-v1", "webrtc-direct"],