From cdaa6dd5913427d1cba3d4739edc9f75240ac43c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 25 Jan 2022 16:42:37 +0100
Subject: [PATCH] Adjust workflow with solc-js checkout now that it's on
 TypeScrpt

---
 scripts/solc-bin/bytecode_reports_for_modified_binaries.sh | 4 +++-
 scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh        | 1 +
 test/externalTests/common.sh                               | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh b/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
index 5638d62a7..be151bca8 100755
--- a/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
+++ b/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
@@ -109,6 +109,7 @@ cd "$tmp_dir"
 git clone https://github.com/ethereum/solc-js.git "$solcjs_dir"
 cd "$solcjs_dir"
 npm install
+npm run build
 
 cd "${solc_bin_dir}/${platform}/"
 echo "Commit range: ${base_ref}..${top_ref}"
@@ -147,11 +148,12 @@ for binary_name in $platform_binaries; do
 
         if [[ $platform == emscripten-wasm32 ]] || [[ $platform == emscripten-asmjs ]]; then
             ln -sf "${solc_bin_dir}/${platform}/${binary_name}" "${solcjs_dir}/soljson.js"
+            ln -sf "${solc_bin_dir}/${platform}/${binary_name}" "${solcjs_dir}/dist/soljson.js"
             ln -s "${solcjs_dir}" solc-js
             cp "${script_dir}/bytecodecompare/prepare_report.js" prepare_report.js
 
             validate_reported_version \
-                "$(solc-js/solc.js --version)" \
+                "$(solc-js/dist/solc.js --version)" \
                 "$solidity_version_and_commit"
 
             # shellcheck disable=SC2035
diff --git a/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh b/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
index eaca0c730..6293d182b 100755
--- a/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
+++ b/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
@@ -228,6 +228,7 @@ mkdir -p "${OUTPUTDIR}"/bin
 echo "Prepare solc-js."
 cd /root/solc-js
 npm install >/dev/null 2>&1
+npm run build >/dev/null 2>&1
 
 echo "Install semver helper."
 npm install -g semver >/dev/null 2>&1
diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index 396612b96..10df97525 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -84,7 +84,8 @@ function setup_solc
         pushd "$install_dir"
         npm install
         cp "$binary_path" soljson.js
-        SOLCVERSION=$(./solc.js --version)
+        npm run build
+        SOLCVERSION=$(dist/solc.js --version)
         popd
     else
         printLog "Setting up solc..."