cerc-io/solidity
16
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

Merge pull request #5658 from ethereum/chriseth-patch-1

Browse Source 
Add gnosis safe as external test.
This commit is contained in:
chriseth 2018-12-17 13:48:57 +01:00 committed by GitHub
commit 5b95e816b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.circleci/config.yml
View File

@ -68,7 +68,7 @@ jobs:
- version.txt - version.txt
test_emscripten_solcjs: test_emscripten_solcjs:
docker: docker:
- image: trzeci/emscripten:sdk-tag-1.37.21-64bit - image: circleci/node:10
environment: environment:
TERM: xterm TERM: xterm
steps: steps:
@ -78,23 +78,15 @@ jobs:
- run: - run:
name: Install external tests deps name: Install external tests deps
command: | 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 node --version
npm --version npm --version
- run: - run:
name: Test solcjs name: Test solcjs
command: | command: |
. /usr/local/nvm/nvm.sh
test/solcjsTests.sh /tmp/workspace/soljson.js $(cat /tmp/workspace/version.txt) test/solcjsTests.sh /tmp/workspace/soljson.js $(cat /tmp/workspace/version.txt)
test_emscripten_external: test_emscripten_external:
docker: docker:
- image: trzeci/emscripten:sdk-tag-1.37.21-64bit - image: circleci/node:10
environment: environment:
TERM: xterm TERM: xterm
steps: steps:
@ -104,19 +96,11 @@ jobs:
- run: - run:
name: Install external tests deps name: Install external tests deps
command: | 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 node --version
npm --version npm --version
- run: - run:
name: External tests name: External tests
command: | command: |
. /usr/local/nvm/nvm.sh
test/externalTests.sh /tmp/workspace/soljson.js || test/externalTests.sh /tmp/workspace/soljson.js test/externalTests.sh /tmp/workspace/soljson.js || test/externalTests.sh /tmp/workspace/soljson.js
build_x86_linux: build_x86_linux:
docker: docker:

3
test/externalTests.sh
View File

@ -79,6 +79,7 @@ function test_truffle
fi fi
# Change "compileStandard" to "compile" # Change "compileStandard" to "compile"
sed -i s/solc.compileStandard/solc.compile/ "node_modules/truffle/build/cli.bundled.js" sed -i s/solc.compileStandard/solc.compile/ "node_modules/truffle/build/cli.bundled.js"
npx truffle compile
npm run test npm run test
) )
rm -rf "$DIR" 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. # 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 Gnosis https://github.com/axic/pm-contracts.git solidity-050
test_truffle GnosisSafe https://github.com/gnosis/safe-contracts.git development