Pass evm_values as parameter rather than environment variable

ethereum · Feb 2, 2024 · a356764 · a356764
1 parent a8999ec
commit a356764
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -231,9 +231,7 @@ commands:
       - run:
           name: soltest_all
           no_output_timeout: 30m
-          command: .circleci/soltest_all.sh
-          environment:
-            EVM_VALUES: "<< parameters.evm_versions >>"
+          command: .circleci/soltest_all.sh "<< parameters.evm_versions >>"
 
   run_cmdline_tests:
     steps:

diff --git a/.circleci/soltest_all.sh b/.circleci/soltest_all.sh
@@ -32,12 +32,11 @@ REPODIR="$(realpath "$(dirname "$0")"/..)"
 source "${REPODIR}/scripts/common.sh"
 
 DEFAULT_EVM_VALUES=(constantinople petersburg istanbul berlin london paris shanghai cancun)
-# Deserialize the EVM_VALUES array from the environment variable if provided or
+# Deserialize the EVM_VALUES array if it was provided as argument or
 # set EVM_VALUES to the default values.
-IFS=" " read -ra EVM_VALUES <<< "${EVM_VALUES:-${DEFAULT_EVM_VALUES[@]}}"
+IFS=" " read -ra EVM_VALUES <<< "${1:-${DEFAULT_EVM_VALUES[@]}}"
 
 DEFAULT_EVM=shanghai
-[[ " ${EVM_VALUES[*]} " =~ $DEFAULT_EVM ]]
 OPTIMIZE_VALUES=(0 1)
 
 # Run for ABI encoder v1, without SMTChecker tests.