From 66e0aaad8d197f27ae68740d3f76fc5507ecabd1 Mon Sep 17 00:00:00 2001 From: Prithvi Shahi Date: Wed, 9 Aug 2023 17:15:03 -0700 Subject: [PATCH] chore: update go-libp2p releases and rm v0.25 & v0.26 --- multidim-interop/impl/go/v0.25/Makefile | 20 ----------------- multidim-interop/impl/go/v0.26/Makefile | 20 ----------------- multidim-interop/impl/go/v0.27/Makefile | 25 +++++++++++++++------ multidim-interop/impl/go/v0.27/version.lock | 1 + multidim-interop/impl/go/v0.28/Makefile | 25 +++++++++++++++------ multidim-interop/impl/go/v0.28/version.lock | 1 + multidim-interop/impl/go/v0.29/Makefile | 2 +- multidim-interop/impl/go/v0.29/version.lock | 2 +- multidim-interop/versions.ts | 12 +++------- 9 files changed, 43 insertions(+), 65 deletions(-) delete mode 100644 multidim-interop/impl/go/v0.25/Makefile delete mode 100644 multidim-interop/impl/go/v0.26/Makefile create mode 100644 multidim-interop/impl/go/v0.27/version.lock create mode 100644 multidim-interop/impl/go/v0.28/version.lock diff --git a/multidim-interop/impl/go/v0.25/Makefile b/multidim-interop/impl/go/v0.25/Makefile deleted file mode 100644 index 785abaa3e..000000000 --- a/multidim-interop/impl/go/v0.25/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -image_name := go-v0.25 -commitSha := 5741b6c9bbcc1185bdf94d816dca966b37ce61ff - -all: image.json - -image.json: go-libp2p-${commitSha} - cd go-libp2p-${commitSha} && IMAGE_NAME=${image_name} ../../../../dockerBuildWrapper.sh -f test-plans/PingDockerfile . - docker image inspect ${image_name} -f "{{.Id}}" | \ - xargs -I {} echo "{\"imageID\": \"{}\"}" > $@ - -go-libp2p-${commitSha}: go-libp2p-${commitSha}.zip - unzip -o go-libp2p-${commitSha}.zip - -go-libp2p-${commitSha}.zip: - wget -O $@ "https://github.com/libp2p/go-libp2p/archive/${commitSha}.zip" - -clean: - rm image.json - rm go-libp2p-*.zip - rm -rf go-libp2p-* diff --git a/multidim-interop/impl/go/v0.26/Makefile b/multidim-interop/impl/go/v0.26/Makefile deleted file mode 100644 index f82e19277..000000000 --- a/multidim-interop/impl/go/v0.26/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -image_name := go-v0.26 -commitSha := 8313917571fec7d26813ff437013fde6f48659f7 - -all: image.json - -image.json: go-libp2p-${commitSha} - cd go-libp2p-${commitSha} && IMAGE_NAME=${image_name} ../../../../dockerBuildWrapper.sh -f test-plans/PingDockerfile . - docker image inspect ${image_name} -f "{{.Id}}" | \ - xargs -I {} echo "{\"imageID\": \"{}\"}" > $@ - -go-libp2p-${commitSha}: go-libp2p-${commitSha}.zip - unzip -o go-libp2p-${commitSha}.zip - -go-libp2p-${commitSha}.zip: - wget -O $@ "https://github.com/libp2p/go-libp2p/archive/${commitSha}.zip" - -clean: - rm image.json - rm go-libp2p-*.zip - rm -rf go-libp2p-* diff --git a/multidim-interop/impl/go/v0.27/Makefile b/multidim-interop/impl/go/v0.27/Makefile index 726d70e4d..7117881ce 100644 --- a/multidim-interop/impl/go/v0.27/Makefile +++ b/multidim-interop/impl/go/v0.27/Makefile @@ -1,18 +1,29 @@ image_name := go-v0.27 -commitSha := 2df518f43fa2c3e937b81c249c2c5b898421df6b +version := 0.27.9 all: image.json -image.json: go-libp2p-${commitSha} - cd go-libp2p-${commitSha} && IMAGE_NAME=${image_name} ../../../../dockerBuildWrapper.sh -f test-plans/PingDockerfile . +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-${commitSha}: go-libp2p-${commitSha}.zip - unzip -o go-libp2p-${commitSha}.zip +go-libp2p-${version}: go-libp2p-${version}.zip + unzip -o go-libp2p-${version}.zip -go-libp2p-${commitSha}.zip: - wget -O $@ "https://github.com/libp2p/go-libp2p/archive/${commitSha}.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 diff --git a/multidim-interop/impl/go/v0.27/version.lock b/multidim-interop/impl/go/v0.27/version.lock new file mode 100644 index 000000000..f8772f521 --- /dev/null +++ b/multidim-interop/impl/go/v0.27/version.lock @@ -0,0 +1 @@ +c8791847f0be31a1bc922ce396d77efe62dba491b3a884017662030027304c3d go-libp2p-0.27.9.zip diff --git a/multidim-interop/impl/go/v0.28/Makefile b/multidim-interop/impl/go/v0.28/Makefile index ac3e53871..266684b9e 100644 --- a/multidim-interop/impl/go/v0.28/Makefile +++ b/multidim-interop/impl/go/v0.28/Makefile @@ -1,18 +1,29 @@ image_name := go-v0.28 -commitSha := 703c3a4377d1ca2cf3fc93c92c883be1644f3ba6 +version := 0.28.3 all: image.json -image.json: go-libp2p-${commitSha} - cd go-libp2p-${commitSha} && IMAGE_NAME=${image_name} ../../../../dockerBuildWrapper.sh -f test-plans/PingDockerfile . +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-${commitSha}: go-libp2p-${commitSha}.zip - unzip -o go-libp2p-${commitSha}.zip +go-libp2p-${version}: go-libp2p-${version}.zip + unzip -o go-libp2p-${version}.zip -go-libp2p-${commitSha}.zip: - wget -O $@ "https://github.com/libp2p/go-libp2p/archive/${commitSha}.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 diff --git a/multidim-interop/impl/go/v0.28/version.lock b/multidim-interop/impl/go/v0.28/version.lock new file mode 100644 index 000000000..3b6888316 --- /dev/null +++ b/multidim-interop/impl/go/v0.28/version.lock @@ -0,0 +1 @@ +0f71bbb4d1485a548e50d266ec8a31dbefb9339306c26e8b21691e94782c5075 go-libp2p-0.28.3.zip diff --git a/multidim-interop/impl/go/v0.29/Makefile b/multidim-interop/impl/go/v0.29/Makefile index 985e5d0e7..e3cc3d564 100644 --- a/multidim-interop/impl/go/v0.29/Makefile +++ b/multidim-interop/impl/go/v0.29/Makefile @@ -1,5 +1,5 @@ image_name := go-v0.29 -version := 0.29.0 +version := 0.29.2 all: image.json diff --git a/multidim-interop/impl/go/v0.29/version.lock b/multidim-interop/impl/go/v0.29/version.lock index 9108e0589..8c35a0ac6 100644 --- a/multidim-interop/impl/go/v0.29/version.lock +++ b/multidim-interop/impl/go/v0.29/version.lock @@ -1 +1 @@ -473edd5482a9387ab532a46dfc32413aced2119eb47ad8dd7e16fb926ac74d29 go-libp2p-0.29.0.zip +3a9233632ee21e95dfcff15d1fb25f23fcc57d6b64398e05bd5a5a6038afa566 go-libp2p-0.29.2.zip diff --git a/multidim-interop/versions.ts b/multidim-interop/versions.ts index 576612b1b..6475e5301 100644 --- a/multidim-interop/versions.ts +++ b/multidim-interop/versions.ts @@ -115,25 +115,19 @@ export const versions: Array = [ muxers: ["mplex", "yamux"], }, { - id: "go-v0.28", + id: "go-v0.29", transports: ["tcp", "ws", "quic", "quic-v1", "webtransport"], secureChannels: ["tls", "noise"], muxers: ["mplex", "yamux"], }, { - id: "go-v0.27", - transports: ["tcp", "ws", "quic", "quic-v1", "webtransport"], - secureChannels: ["tls", "noise"], - muxers: ["mplex", "yamux"], - }, - { - id: "go-v0.26", + id: "go-v0.28", transports: ["tcp", "ws", "quic", "quic-v1", "webtransport"], secureChannels: ["tls", "noise"], muxers: ["mplex", "yamux"], }, { - id: "go-v0.25", + id: "go-v0.27", transports: ["tcp", "ws", "quic", "quic-v1", "webtransport"], secureChannels: ["tls", "noise"], muxers: ["mplex", "yamux"],