From c7e57a412416daa953ed62150a67a61b0924597e Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 13 Nov 2017 18:42:02 -0500 Subject: Move conditional running of umd test to 0x.js's package.json --- .circleci/config.yml | 1 - packages/0x.js/package.json | 2 +- 2 files changed, 1 insertion(+), 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", -- cgit v1.2.3