aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2017-11-14 07:42:02 +0800
committerFabio Berger <me@fabioberger.com>2017-11-14 07:42:02 +0800
commitc7e57a412416daa953ed62150a67a61b0924597e (patch)
tree49aab578b3b04614f2e31d51e37985f56d3dd211
parentee1a44ebebeb3ce1d4693c7162aea75de851e6d5 (diff)
downloaddexon-sol-tools-c7e57a412416daa953ed62150a67a61b0924597e.tar
dexon-sol-tools-c7e57a412416daa953ed62150a67a61b0924597e.tar.gz
dexon-sol-tools-c7e57a412416daa953ed62150a67a61b0924597e.tar.bz2
dexon-sol-tools-c7e57a412416daa953ed62150a67a61b0924597e.tar.lz
dexon-sol-tools-c7e57a412416daa953ed62150a67a61b0924597e.tar.xz
dexon-sol-tools-c7e57a412416daa953ed62150a67a61b0924597e.tar.zst
dexon-sol-tools-c7e57a412416daa953ed62150a67a61b0924597e.zip
Move conditional running of umd test to 0x.js's package.json
-rw-r--r--.circleci/config.yml1
-rw-r--r--packages/0x.js/package.json2
2 files changed, 1 insertions, 2 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index d6d02a4f9..9a39dd33c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -25,5 +25,4 @@ jobs:
command: npm run testrpc -- --db testrpc_snapshot
background: true
- run: yarn lerna:run test:circleci
- - run: if [ $CIRCLE_BRANCH = "development" ]; then yarn lerna:run test:umd; fi
- run: yarn lerna:run lint
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 5cbbc2f59..6839e6513 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -19,7 +19,7 @@
"release": "publish-release --assets _bundles/index.js,_bundles/index.min.js --tag $(git describe --tags) --owner 0xProject --repo 0x.js",
"upload_docs_json": "aws s3 cp docs/index.json s3://0xjs-docs-jsons/$(git describe --tags).json --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type aplication/json",
"lint": "tslint src/**/*.ts test/**/*.ts",
- "test:circleci": "run-s test:coverage report_test_coverage",
+ "test:circleci": "run-s test:coverage report_test_coverage; if [ $CIRCLE_BRANCH = \"development\" ]; then yarn test:umd; fi",
"test": "run-s clean test:commonjs",
"test:umd": "./scripts/test_umd.sh",
"test:coverage": "nyc npm run test --all",