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

fix(interop/rust/wasm): bump version to use chrome 115 #273

Merged
merged 2 commits into from
Aug 24, 2023
Merged

fix(interop/rust/wasm): bump version to use chrome 115 #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
444915f
fix(interop/rust/wasm): bump version to use chrome 115
mxinden Aug 23, 2023
972f6f2
Fix commitSha mechanism
mxinden Aug 23, 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
30 changes: 9 additions & 21 deletions multidim-interop/impl/rust/v0.52/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,23 @@
image_name := rust-v0.52
version := 0.52.2
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
Expand Down
1 change: 0 additions & 1 deletion multidim-interop/impl/rust/v0.52/version.lock
View file
Open in desktop
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See #253 (comment) for rational on using old commitSha mechanism instead of version mechanism.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makefile has assumptions about fetching using a tag so it needs to be changed to mirror 0.51.0

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 naive me thought a single line change is enough. Thanks @p-shahi. See 972f6f2.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Np ultimately caused by me since I moved to use tags :(
It seems like using commit hash has it's own advantages

This file was deleted.