Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: rm rust-libp2p v0.49 and v0.50, update v0.52 #253

Merged
merged 6 commits into from
Aug 11, 2023
Merged

chore: rm rust-libp2p v0.49 and v0.50, update v0.52 #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cb0e052
chore: rm rust-libp2p v0.49 and v0.50, update v0.51, v0.52
p-shahi Aug 10, 2023
e270182
fix: use interop-tests/Dockerfile
mxinden Aug 10, 2023
deef269
fix: move unziped folder
mxinden Aug 10, 2023
b332ea6
readd chromium-image.json and fix dockerfile name in 0.52
p-shahi Aug 10, 2023
c48d3d7
.
p-shahi Aug 10, 2023
6723b4a
revert 0.51 and update 0.52.2
p-shahi Aug 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions multidim-interop/impl/rust/v0.49/Makefile
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions multidim-interop/impl/rust/v0.50/Makefile
View file
Open in desktop

This file was deleted.

30 changes: 21 additions & 9 deletions multidim-interop/impl/rust/v0.52/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions multidim-interop/impl/rust/v0.52/version.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d6235033673b133eead02b40ec56cb913da454c4113696d1e63283550aef9155 rust-libp2p-0.52.2.zip
12 changes: 0 additions & 12 deletions multidim-interop/versions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,6 @@ function browserImageIDLookup(id: string): string {
}

export const versions: Array<Version> = [
{
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"],
Expand Down