From 444915f911fb4405f54e2841092efd7c40c4cbf5 Mon Sep 17 00:00:00 2001 From: Max Inden Date: Wed, 23 Aug 2023 21:24:51 +0200 Subject: [PATCH 1/2] fix(interop/rust/wasm): bump version to use chrome 115 Bump rust-libp2p v0.52 interop version to include https://github.com/libp2p/rust-libp2p/pull/4383 which fixes issue in https://github.com/libp2p/go-libp2p/pull/2506. --- multidim-interop/impl/rust/v0.52/Makefile | 2 +- multidim-interop/impl/rust/v0.52/version.lock | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 multidim-interop/impl/rust/v0.52/version.lock diff --git a/multidim-interop/impl/rust/v0.52/Makefile b/multidim-interop/impl/rust/v0.52/Makefile index c18066738..f8280b998 100644 --- a/multidim-interop/impl/rust/v0.52/Makefile +++ b/multidim-interop/impl/rust/v0.52/Makefile @@ -1,5 +1,5 @@ image_name := rust-v0.52 -version := 0.52.2 +commitSha := 54fa53af393adac83f9aab273c3d30efbc31ba57 all: image.json chromium-image.json diff --git a/multidim-interop/impl/rust/v0.52/version.lock b/multidim-interop/impl/rust/v0.52/version.lock deleted file mode 100644 index a0b372ad6..000000000 --- a/multidim-interop/impl/rust/v0.52/version.lock +++ /dev/null @@ -1 +0,0 @@ -d6235033673b133eead02b40ec56cb913da454c4113696d1e63283550aef9155 rust-libp2p-0.52.2.zip From 972f6f259b4dfe2bf26a374a44a877dfa8d39711 Mon Sep 17 00:00:00 2001 From: Max Inden Date: Wed, 23 Aug 2023 21:41:31 +0200 Subject: [PATCH 2/2] Fix commitSha mechanism --- multidim-interop/impl/rust/v0.52/Makefile | 28 +++++++---------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/multidim-interop/impl/rust/v0.52/Makefile b/multidim-interop/impl/rust/v0.52/Makefile index f8280b998..87d2e8ee5 100644 --- a/multidim-interop/impl/rust/v0.52/Makefile +++ b/multidim-interop/impl/rust/v0.52/Makefile @@ -3,33 +3,21 @@ commitSha := 54fa53af393adac83f9aab273c3d30efbc31ba57 all: image.json chromium-image.json -chromium-image.json: verify-checksum rust-libp2p-${version} - cd rust-libp2p-${version} && IMAGE_NAME=${image_name} ../../../../dockerBuildWrapper.sh -f interop-tests/Dockerfile.chromium . +chromium-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\": \"{}\"}" > $@ -image.json: verify-checksum rust-libp2p-${version} - cd rust-libp2p-${version} && IMAGE_NAME=${image_name} ../../../../dockerBuildWrapper.sh -f interop-tests/Dockerfile.native . +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-${version}: rust-libp2p-${version}.zip - unzip -o rust-libp2p-${version}.zip - mv rust-libp2p-libp2p-v${version} rust-libp2p-${version} +rust-libp2p-${commitSha}: rust-libp2p-${commitSha}.zip + unzip -o rust-libp2p-${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 +rust-libp2p-${commitSha}.zip: + wget -O $@ "https://github.com/libp2p/rust-libp2p/archive/${commitSha}.zip" clean: rm image.json