diff options
author | Fabio Berger <me@fabioberger.com> | 2017-06-03 01:45:57 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2017-06-03 01:45:57 +0800 |
commit | 1443c0838cbd795ae8e6273b1d7659c8e449f2eb (patch) | |
tree | 531df9d489dd4c5ce15623bee0beeae3ad58ccd4 /circle.yml | |
parent | 3de655954743db4e2b9d02f5ac1243855b909236 (diff) | |
parent | d4320fec724c5bf34e7dcd006cba8ffe7a3c76d1 (diff) | |
download | dexon-sol-tools-1443c0838cbd795ae8e6273b1d7659c8e449f2eb.tar dexon-sol-tools-1443c0838cbd795ae8e6273b1d7659c8e449f2eb.tar.gz dexon-sol-tools-1443c0838cbd795ae8e6273b1d7659c8e449f2eb.tar.bz2 dexon-sol-tools-1443c0838cbd795ae8e6273b1d7659c8e449f2eb.tar.lz dexon-sol-tools-1443c0838cbd795ae8e6273b1d7659c8e449f2eb.tar.xz dexon-sol-tools-1443c0838cbd795ae8e6273b1d7659c8e449f2eb.tar.zst dexon-sol-tools-1443c0838cbd795ae8e6273b1d7659c8e449f2eb.zip |
Merge branch 'master' into remainingTokenMethods
# Conflicts:
# src/types.ts
# src/web3_wrapper.ts
Diffstat (limited to 'circle.yml')
-rw-r--r-- | circle.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/circle.yml b/circle.yml index 448524aa1..4919516f2 100644 --- a/circle.yml +++ b/circle.yml @@ -4,7 +4,7 @@ machine: test: override: - - node node_modules/ethereumjs-testrpc/bin/testrpc -m "concert load couple harbor equip island argue ramp clarify fence smart topic": + - npm run testrpc: background: true - git clone git@github.com:0xProject/contracts.git ../contracts - cd ../contracts; git checkout 38c2b4c; npm install && npm run migrate |