Skip to content

Commit

Permalink
Merge pull request ethereum#13850 from ethereum/zeppelin-ci-sandbox
Browse files Browse the repository at this point in the history
Silence version check and up node heap limit for Zeppelin tests
  • Loading branch information
nikola-matic authored Jan 5, 2023
2 parents e6b579f + 5ecf307 commit 090a9d0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 3 additions & 3 deletions test/externalTests/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ function truffle_verify_compiler_version
local full_solc_version="$2"

printLog "Verify that the correct version (${solc_version}/${full_solc_version}) of the compiler was used to compile the contracts..."
grep "$full_solc_version" --with-filename --recursive build/contracts || fail "Wrong compiler version detected."
grep "$full_solc_version" --recursive --quiet build/contracts || fail "Wrong compiler version detected."
}

function hardhat_verify_compiler_version
Expand All @@ -357,8 +357,8 @@ function hardhat_verify_compiler_version
local build_info_files
build_info_files=$(find . -path '*artifacts/build-info/*.json')
for build_info_file in $build_info_files; do
grep '"solcVersion":[[:blank:]]*"'"${solc_version}"'"' --with-filename "$build_info_file" || fail "Wrong compiler version detected in ${build_info_file}."
grep '"solcLongVersion":[[:blank:]]*"'"${full_solc_version}"'"' --with-filename "$build_info_file" || fail "Wrong compiler version detected in ${build_info_file}."
grep '"solcVersion":[[:blank:]]*"'"${solc_version}"'"' --quiet "$build_info_file" || fail "Wrong compiler version detected in ${build_info_file}."
grep '"solcLongVersion":[[:blank:]]*"'"${full_solc_version}"'"' --quiet "$build_info_file" || fail "Wrong compiler version detected in ${build_info_file}."
done
}

Expand Down
2 changes: 2 additions & 0 deletions test/externalTests/zeppelin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
# shellcheck disable=SC2016

set -e
# Temporary(?) fix to up the heap limit for node in order to prevent 'out of heap errors'
export NODE_OPTIONS="--max-old-space-size=4096"

source scripts/common.sh
source test/externalTests/common.sh
Expand Down

0 comments on commit 090a9d0

Please sign in to comment.