Skip to content

Commit

Permalink
fix: make rust-chromium a separate implementation (#302)
Browse files Browse the repository at this point in the history
  • Loading branch information
thomaseizinger authored Sep 14, 2023
1 parent a96d930 commit d9a5c38
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 8 deletions.
5 changes: 5 additions & 0 deletions multidim-interop/impl/rust-chromium/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
rust-libp2p-*.zip
rust-libp2p-*
rust-libp2p-*/*
image.json
chromium-image.json
20 changes: 20 additions & 0 deletions multidim-interop/impl/rust-chromium/v0.52/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
image_name := rust-v0.52
commitSha := 54fa53af393adac83f9aab273c3d30efbc31ba57

all: image.json

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\": \"{}\"}" > $@

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-*
7 changes: 1 addition & 6 deletions multidim-interop/impl/rust/v0.52/Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
image_name := rust-v0.52
commitSha := 54fa53af393adac83f9aab273c3d30efbc31ba57

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 .
docker image inspect ${image_name} -f "{{.Id}}" | \
xargs -I {} echo "{\"imageID\": \"{}\"}" > $@
all: image.json

image.json: rust-libp2p-${commitSha}
cd rust-libp2p-${commitSha} && IMAGE_NAME=${image_name} ../../../../dockerBuildWrapper.sh -f interop-tests/Dockerfile.native .
Expand Down
3 changes: 1 addition & 2 deletions multidim-interop/versions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ export const versions: Array<Version> = [
muxers: ["mplex", "yamux"],
},
{
id: "chromium-rust-v0.52",
containerImageID: browserImageIDLookup,
id: "rust-chromium-v0.52",
transports: [{ name: "webtransport", onlyDial: true }],
secureChannels: [],
muxers: [],
Expand Down

0 comments on commit d9a5c38

Please sign in to comment.