diff options
| author | chriseth <chris@ethereum.org> | 2018-12-17 20:48:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-17 20:48:57 +0800 |
| commit | 5b95e816b27ec5ad6608fd71e1f414ca9e759908 (patch) | |
| tree | c81e9a4356fb5ee30482db2938894bbc704112e3 | |
| parent | 1287402920d76e018dbbd7a8b54540d46c645a1f (diff) | |
| parent | 2f11a677dea5e6566bece55084a7fcb5570b71f1 (diff) | |
| download | dexon-solidity-5b95e816b27ec5ad6608fd71e1f414ca9e759908.tar dexon-solidity-5b95e816b27ec5ad6608fd71e1f414ca9e759908.tar.gz dexon-solidity-5b95e816b27ec5ad6608fd71e1f414ca9e759908.tar.bz2 dexon-solidity-5b95e816b27ec5ad6608fd71e1f414ca9e759908.tar.lz dexon-solidity-5b95e816b27ec5ad6608fd71e1f414ca9e759908.tar.xz dexon-solidity-5b95e816b27ec5ad6608fd71e1f414ca9e759908.tar.zst dexon-solidity-5b95e816b27ec5ad6608fd71e1f414ca9e759908.zip | |
Merge pull request #5658 from ethereum/chriseth-patch-1
Add gnosis safe as external test.
| -rw-r--r-- | .circleci/config.yml | 20 | ||||
| -rwxr-xr-x | test/externalTests.sh | 3 |
2 files changed, 5 insertions, 18 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 6c5f3e85..c13bef35 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -68,7 +68,7 @@ jobs: - version.txt test_emscripten_solcjs: docker: - - image: trzeci/emscripten:sdk-tag-1.37.21-64bit + - image: circleci/node:10 environment: TERM: xterm steps: @@ -78,23 +78,15 @@ jobs: - run: name: Install external tests deps command: | - apt-get -qq update - apt-get -qy install netcat curl - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.4/install.sh | NVM_DIR=/usr/local/nvm bash - export NVM_DIR="/usr/local/nvm" - [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm - nvm --version - nvm install 8 node --version npm --version - run: name: Test solcjs command: | - . /usr/local/nvm/nvm.sh test/solcjsTests.sh /tmp/workspace/soljson.js $(cat /tmp/workspace/version.txt) test_emscripten_external: docker: - - image: trzeci/emscripten:sdk-tag-1.37.21-64bit + - image: circleci/node:10 environment: TERM: xterm steps: @@ -104,19 +96,11 @@ jobs: - run: name: Install external tests deps command: | - apt-get -qq update - apt-get -qy install netcat curl - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.4/install.sh | NVM_DIR=/usr/local/nvm bash - export NVM_DIR="/usr/local/nvm" - [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm - nvm --version - nvm install 8 node --version npm --version - run: name: External tests command: | - . /usr/local/nvm/nvm.sh test/externalTests.sh /tmp/workspace/soljson.js || test/externalTests.sh /tmp/workspace/soljson.js build_x86_linux: docker: diff --git a/test/externalTests.sh b/test/externalTests.sh index 93581925..16f9e55a 100755 --- a/test/externalTests.sh +++ b/test/externalTests.sh @@ -79,6 +79,7 @@ function test_truffle fi # Change "compileStandard" to "compile" sed -i s/solc.compileStandard/solc.compile/ "node_modules/truffle/build/cli.bundled.js" + npx truffle compile npm run test ) rm -rf "$DIR" @@ -89,3 +90,5 @@ test_truffle Zeppelin https://github.com/axic/openzeppelin-solidity.git solidity # Disabled temporarily as it needs to be updated to latest Truffle first. #test_truffle Gnosis https://github.com/axic/pm-contracts.git solidity-050 + +test_truffle GnosisSafe https://github.com/gnosis/safe-contracts.git development |