From 5d2ee3ef0dd7d7e29bd60b7c109289ac87d1e238 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= Date: Wed, 16 Feb 2022 20:56:06 +0100 Subject: [PATCH] [DEBUG] Use local Solidity checkout with modernize-wasm-rebuild branch --- scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh | 8 +++++--- scripts/wasm-rebuild/rebuild.sh | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh b/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh index dcb0abf4e..42b3bc04f 100755 --- a/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh +++ b/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh @@ -24,7 +24,9 @@ while (( "$#" )); do shift done -SOLIDITY_REPO_URL="https://github.com/ethereum/solidity" +# TMP: +#SOLIDITY_REPO_URL="https://github.com/ethereum/solidity" +SOLIDITY_REPO_URL="/tmp/solidity" SOLC_JS_REPO_URL="https://github.com/ethereum/solc-js" SOLC_JS_BRANCH=wasmRebuildTests RELEASE_URL="https://binaries.soliditylang.org/bin" @@ -189,9 +191,9 @@ else git clone "${SOLIDITY_REPO_URL}" /root/project --quiet fi -echo "Extract bytecode comparison scripts from v0.6.1..." +echo "Extract bytecode comparison scripts from modernize-wasm-rebuild..." cd /root/project -git checkout v0.6.1 --quiet +git checkout modernize-wasm-rebuild --quiet cp -r scripts /tmp/solidity-scripts export SOLC_EMSCRIPTEN="On" diff --git a/scripts/wasm-rebuild/rebuild.sh b/scripts/wasm-rebuild/rebuild.sh index 07f6c744a..a9129a521 100755 --- a/scripts/wasm-rebuild/rebuild.sh +++ b/scripts/wasm-rebuild/rebuild.sh @@ -31,6 +31,7 @@ docker run \ --rm \ --interactive \ --tty \ + --volume /projects/solidity:/tmp/solidity:ro \ --volume "${OUTPUTDIR}":/tmp/output \ --volume "${SCRIPTDIR}":/tmp/scripts:ro \ "${DOCKER_IMAGE}" \