Adjust workflow with solc-js checkout now that it's on TypeScrpt

This commit is contained in:
Kamil Śliwak 2022-01-25 16:42:37 +01:00
parent 8011d23b5c
commit cdaa6dd591
3 changed files with 6 additions and 2 deletions

View File

@ -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

View File

@ -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

View File

@ -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..."