diff --git a/.circleci/config.yml b/.circleci/config.yml index cc06eac4e..0224ac93b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -829,7 +829,7 @@ jobs: name: External GnosisSafe compilation command: | export COMPILE_ONLY=1 - test/externalTests/gnosis.sh /tmp/workspace/soljson.js || test/externalTests/gnosis.sh /tmp/workspace/soljson.js + test/externalTests/gnosis.sh /tmp/workspace/soljson.js t_ems_test_ext_gnosis: docker: @@ -860,7 +860,7 @@ jobs: name: External Zeppelin compilation command: | export COMPILE_ONLY=1 - test/externalTests/zeppelin.sh /tmp/workspace/soljson.js || test/externalTests/zeppelin.sh /tmp/workspace/soljson.js + test/externalTests/zeppelin.sh /tmp/workspace/soljson.js t_ems_test_ext_zeppelin: docker: @@ -895,7 +895,7 @@ jobs: name: External ColonyNetworks compilation command: | export COMPILE_ONLY=1 - test/externalTests/colony.sh /tmp/workspace/soljson.js || test/externalTests/colony.sh /tmp/workspace/soljson.js + test/externalTests/colony.sh /tmp/workspace/soljson.js t_ems_test_ext_colony: docker: @@ -917,6 +917,25 @@ jobs: - run: *gitter_notify_failure - run: *gitter_notify_success + t_ems_compile_ext_ens: + docker: + - image: circleci/node:10 + environment: + TERM: xterm + steps: + - checkout + - attach_workspace: + at: /tmp/workspace + - run: + name: Install test dependencies + command: | + sudo apt-get -qy install lsof + - run: + name: External Ens compilation + command: | + export COMPILE_ONLY=1 + test/externalTests/ens.sh /tmp/workspace/soljson.js + b_win: &b_win executor: name: win/default @@ -1101,6 +1120,7 @@ workflows: - t_ems_compile_ext_colony: *workflow_emscripten - t_ems_compile_ext_gnosis: *workflow_emscripten - t_ems_compile_ext_zeppelin: *workflow_emscripten + - t_ems_compile_ext_ens: *workflow_emscripten # Windows build and tests - b_win: *workflow_trigger_on_tags diff --git a/test/externalTests.sh b/test/externalTests.sh index d7ba829a7..7bf3eb76b 100755 --- a/test/externalTests.sh +++ b/test/externalTests.sh @@ -45,6 +45,7 @@ printTask "Running external tests..." $REPO_ROOT/externalTests/zeppelin.sh "$SOLJSON" $REPO_ROOT/externalTests/gnosis.sh "$SOLJSON" $REPO_ROOT/externalTests/colony.sh "$SOLJSON" +$REPO_ROOT/externalTests/ens.sh "$SOLJSON" # Disabled temporarily as it needs to be updated to latest Truffle first. #test_truffle Gnosis https://github.com/axic/pm-contracts.git solidity-050 diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh new file mode 100755 index 000000000..bdd501703 --- /dev/null +++ b/test/externalTests/ens.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +# ------------------------------------------------------------------------------ +# This file is part of solidity. +# +# solidity is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# solidity is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with solidity. If not, see +# +# (c) 2019 solidity contributors. +#------------------------------------------------------------------------------ +# shellcheck disable=SC1091 +source scripts/common.sh +# shellcheck disable=SC1091 +source test/externalTests/common.sh + +verify_input "$1" +export SOLJSON="$1" + +function install_fn { npm install; } +function compile_fn { npx truffle compile; } +function test_fn { npm run test; } + +function ens_test +{ + export OPTIMIZER_LEVEL=1 + export CONFIG="truffle-config.js" + + truffle_setup https://github.com/solidity-external-tests/ens.git upgrade-0.8.0 + run_install install_fn + + truffle_run_test compile_fn test_fn +} + +external_test Ens ens_test