cerc-io/solidity
15
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
View File

@ -109,6 +109,7 @@ cd "$tmp_dir"
git clone https://github.com/ethereum/solc-js.git "$solcjs_dir" git clone https://github.com/ethereum/solc-js.git "$solcjs_dir"
cd "$solcjs_dir" cd "$solcjs_dir"
npm install npm install
npm run build
cd "${solc_bin_dir}/${platform}/" cd "${solc_bin_dir}/${platform}/"
echo "Commit range: ${base_ref}..${top_ref}" 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 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}/soljson.js"
ln -sf "${solc_bin_dir}/${platform}/${binary_name}" "${solcjs_dir}/dist/soljson.js"
ln -s "${solcjs_dir}" solc-js ln -s "${solcjs_dir}" solc-js
cp "${script_dir}/bytecodecompare/prepare_report.js" prepare_report.js cp "${script_dir}/bytecodecompare/prepare_report.js" prepare_report.js
validate_reported_version \ validate_reported_version \
"$(solc-js/solc.js --version)" \ "$(solc-js/dist/solc.js --version)" \
"$solidity_version_and_commit" "$solidity_version_and_commit"
# shellcheck disable=SC2035 # shellcheck disable=SC2035

1
scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
View File

@ -228,6 +228,7 @@ mkdir -p "${OUTPUTDIR}"/bin
echo "Prepare solc-js." echo "Prepare solc-js."
cd /root/solc-js cd /root/solc-js
npm install >/dev/null 2>&1 npm install >/dev/null 2>&1
npm run build >/dev/null 2>&1
echo "Install semver helper." echo "Install semver helper."
npm install -g semver >/dev/null 2>&1 npm install -g semver >/dev/null 2>&1

3
test/externalTests/common.sh
View File

@ -84,7 +84,8 @@ function setup_solc
pushd "$install_dir" pushd "$install_dir"
npm install npm install
cp "$binary_path" soljson.js cp "$binary_path" soljson.js
SOLCVERSION=$(./solc.js --version) npm run build
SOLCVERSION=$(dist/solc.js --version)
popd popd
else else
printLog "Setting up solc..." printLog "Setting up solc..."