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 zombienet scripts for accountid20 compatibility #292

Merged
merged 1 commit into from
Aug 21, 2024
Merged

fix zombienet scripts for accountid20 compatibility #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ docs/node_modules
docs/build

# zombienet stuff
**/zombienet-macos
**/zombienet-macos-arm64
**/zombienet-macos-x64
**/zombienet-linux-arm64
**/zombienet-linux-x64
**/bin-*
27 changes: 24 additions & 3 deletions evm-template/scripts/zombienet.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,41 @@
#!/bin/bash

ZOMBIENET_V=v1.3.91
ZOMBIENET_V=v1.3.106
POLKADOT_V=v1.6.0

# Detect the operating system
case "$(uname -s)" in
Linux*) MACHINE=Linux;;
Darwin*) MACHINE=Mac;;
*) exit 1
esac

# Detect the architecture
ARCH=$(uname -m)

# Set the executable name based on the OS and architecture
if [ $MACHINE = "Linux" ]; then
ZOMBIENET_BIN=zombienet-linux-x64
if [ $ARCH = "x86_64" ]; then
ZOMBIENET_BIN=zombienet-linux-x64
elif [ $ARCH = "arm64" ] || [ $ARCH = "aarch64" ]; then
ZOMBIENET_BIN=zombienet-linux-arm64
else
echo "Unsupported Linux architecture: $ARCH"
exit 1
fi
elif [ $MACHINE = "Mac" ]; then
ZOMBIENET_BIN=zombienet-macos
if [ $ARCH = "x86_64" ]; then
ZOMBIENET_BIN=zombienet-macos-x86
elif [ $ARCH = "arm64" ]; then
ZOMBIENET_BIN=zombienet-macos-arm64
else
echo "Unsupported macOS architecture: $ARCH"
exit 1
fi
fi

echo "Using binary: $ZOMBIENET_BIN"

BIN_DIR=bin-$POLKADOT_V

build_polkadot() {
Expand Down
27 changes: 24 additions & 3 deletions generic-template/scripts/zombienet.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,41 @@
#!/bin/bash

ZOMBIENET_V=v1.3.91
ZOMBIENET_V=v1.3.106
POLKADOT_V=v1.6.0

# Detect the operating system
case "$(uname -s)" in
Linux*) MACHINE=Linux;;
Darwin*) MACHINE=Mac;;
*) exit 1
esac

# Detect the architecture
ARCH=$(uname -m)

# Set the executable name based on the OS and architecture
if [ $MACHINE = "Linux" ]; then
ZOMBIENET_BIN=zombienet-linux-x64
if [ $ARCH = "x86_64" ]; then
ZOMBIENET_BIN=zombienet-linux-x64
elif [ $ARCH = "arm64" ] || [ $ARCH = "aarch64" ]; then
ZOMBIENET_BIN=zombienet-linux-arm64
else
echo "Unsupported Linux architecture: $ARCH"
exit 1
fi
elif [ $MACHINE = "Mac" ]; then
ZOMBIENET_BIN=zombienet-macos
if [ $ARCH = "x86_64" ]; then
ZOMBIENET_BIN=zombienet-macos-x86
elif [ $ARCH = "arm64" ]; then
ZOMBIENET_BIN=zombienet-macos-arm64
else
echo "Unsupported macOS architecture: $ARCH"
exit 1
fi
fi

echo "Using binary: $ZOMBIENET_BIN"

BIN_DIR=bin-$POLKADOT_V

build_polkadot() {
Expand Down
Loading