diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-07-05 08:44:32 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-07-05 08:44:32 +0800 |
| commit | 61a6040e7486f77f27abc388e5e58a7774363b41 (patch) | |
| tree | 2b49490127d3f84fd5063fb7ba2b5cf591f1eb91 | |
| parent | 9c4f3b2cbae3c00b3189f3043e50c0caacfd9186 (diff) | |
| parent | c81855e1196aef738cb741a5ddeacc347a6a81cb (diff) | |
| download | dexon-sol-tools-61a6040e7486f77f27abc388e5e58a7774363b41.tar dexon-sol-tools-61a6040e7486f77f27abc388e5e58a7774363b41.tar.gz dexon-sol-tools-61a6040e7486f77f27abc388e5e58a7774363b41.tar.bz2 dexon-sol-tools-61a6040e7486f77f27abc388e5e58a7774363b41.tar.lz dexon-sol-tools-61a6040e7486f77f27abc388e5e58a7774363b41.tar.xz dexon-sol-tools-61a6040e7486f77f27abc388e5e58a7774363b41.tar.zst dexon-sol-tools-61a6040e7486f77f27abc388e5e58a7774363b41.zip | |
Merge branch 'master' into subscribe-token
| -rw-r--r-- | README.md | 3 | ||||
| -rw-r--r-- | circle.yml | 8 | ||||
| -rw-r--r-- | package.json | 2 |
3 files changed, 8 insertions, 5 deletions
@@ -7,9 +7,10 @@ This repository contains a Javascript library that makes it easy to build Relayers and other DApps that use the 0x protocol. [](https://circleci.com/gh/0xProject/0x.js) +[](https://badge.fury.io/js/0x.js) [](https://coveralls.io/github/0xProject/0x.js?branch=master) [](http://slack.0xProject.com) -[](https://gitter.im/0xProject/contracts?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[](https://gitter.im/0xProject/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [](https://opensource.org/licenses/Apache-2.0) [](https://greenkeeper.io/) diff --git a/circle.yml b/circle.yml index 7bb33efed..d56ff21bb 100644 --- a/circle.yml +++ b/circle.yml @@ -1,13 +1,15 @@ machine: node: version: 6.1.0 + environment: + CONTRACTS_COMMIT_HASH: cd04d7c test: override: - - npm run testrpc: + - wget https://s3.amazonaws.com/testrpc-shapshots/${CONTRACTS_COMMIT_HASH}.zip + - unzip ${CONTRACTS_COMMIT_HASH}.zip -d testrpc_snapshot + - npm run testrpc -- --db testrpc_snapshot: background: true - - git clone git@github.com:0xProject/contracts.git ../contracts - - cd ../contracts; git checkout cd04d7c; npm install && npm run migrate - npm run test:coverage - npm run report_test_coverage - npm run test:umd diff --git a/package.json b/package.json index 4f9c6f3ae..4ff17c2d9 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "scripts": { "prebuild": "npm run clean", "build": "run-p build:*:prod", - "prepublish": "run-p build:umd:prod build:commonjs:dev", + "prepublishOnly": "run-p build:umd:prod build:commonjs:dev", "postpublish": "run-s release docs:json upload_docs_json", "release": "publish-release --assets _bundles/index.js,_bundles/index.min.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", |