aboutsummaryrefslogtreecommitdiffstats
path: root/.circleci
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2019-01-29 00:26:13 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2019-01-29 00:26:13 +0800
commit141ac0ca0be15602a1bcf466e873134e084f30c1 (patch)
treef0e08db40c46e8c671a99231b645365747a8073f /.circleci
parent0c12128f64f7d9a8de6088e98c2e638533d6f5bf (diff)
parent25e42c0ad47e9ec06e474cd12a488ae837660302 (diff)
downloaddexon-0x-contracts-141ac0ca0be15602a1bcf466e873134e084f30c1.tar.gz
dexon-0x-contracts-141ac0ca0be15602a1bcf466e873134e084f30c1.tar.zst
dexon-0x-contracts-141ac0ca0be15602a1bcf466e873134e084f30c1.zip
Merge development
Diffstat (limited to '.circleci')
-rw-r--r--.circleci/config.yml22
1 files changed, 14 insertions, 8 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 90fc2fcc1..a1fc7dc93 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -44,10 +44,13 @@ jobs:
- repo-{{ .Environment.CIRCLE_SHA1 }}
- run: yarn wsrun test:circleci @0x/contracts-multisig
- run: yarn wsrun test:circleci @0x/contracts-utils
- - run: yarn wsrun test:circleci @0x/contracts-libs
- - run: yarn wsrun test:circleci @0x/contracts-tokens
+ - run: yarn wsrun test:circleci @0x/contracts-exchange-libs
+ - run: yarn wsrun test:circleci @0x/contracts-erc20
+ - run: yarn wsrun test:circleci @0x/contracts-erc721
- run: yarn wsrun test:circleci @0x/contracts-extensions
- - run: yarn wsrun test:circleci @0x/contracts-protocol
+ - run: yarn wsrun test:circleci @0x/contracts-asset-proxy
+ - run: yarn wsrun test:circleci @0x/contracts-exchange
+ - run: yarn wsrun test:circleci @0x/contracts-exchange-forwarder
test-contracts-geth:
docker:
- image: circleci/node:9-browsers
@@ -60,11 +63,14 @@ jobs:
# HACK(albrow): we need to sleep 10 seconds to ensure the devnet is
# initialized
- run: sleep 10 && TEST_PROVIDER=geth yarn wsrun test @0x/contracts-multisig
- - run: TEST_PROVIDER=geth yarn wsrun test @0x/contracts-utils
- - run: TEST_PROVIDER=geth yarn wsrun test @0x/contracts-libs
- - run: TEST_PROVIDER=geth yarn wsrun test @0x/contracts-tokens
- - run: TEST_PROVIDER=geth yarn wsrun test @0x/contracts-extensions
- - run: TEST_PROVIDER=geth yarn wsrun test @0x/contracts-protocol
+ - run: TEST_PROVIDER=geth yarn wsrun test:circleci @0x/contracts-utils
+ - run: TEST_PROVIDER=geth yarn wsrun test:circleci @0x/contracts-exchange-libs
+ - run: TEST_PROVIDER=geth yarn wsrun test:circleci @0x/contracts-erc20
+ - run: TEST_PROVIDER=geth yarn wsrun test:circleci @0x/contracts-erc721
+ - run: TEST_PROVIDER=geth yarn wsrun test:circleci @0x/contracts-extensions
+ - run: TEST_PROVIDER=geth yarn wsrun test:circleci @0x/contracts-asset-proxy
+ - run: TEST_PROVIDER=geth yarn wsrun test:circleci @0x/contracts-exchange
+ - run: TEST_PROVIDER=geth yarn wsrun test:circleci @0x/contracts-exchange-forwarder
test-publish:
resource_class: medium+
docker: