aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-10-04 23:35:30 +0800
committerFabio Berger <me@fabioberger.com>2018-10-04 23:35:30 +0800
commit08ba4ffd61e17155b4fcbf0a9d7385ba2af0c725 (patch)
tree4f5c25e45c7d9340a17792356d3274d579e75bef
parentd5379ab3202030a74fb6e0947b2cf3c99e162df3 (diff)
downloaddexon-sol-tools-08ba4ffd61e17155b4fcbf0a9d7385ba2af0c725.tar
dexon-sol-tools-08ba4ffd61e17155b4fcbf0a9d7385ba2af0c725.tar.gz
dexon-sol-tools-08ba4ffd61e17155b4fcbf0a9d7385ba2af0c725.tar.bz2
dexon-sol-tools-08ba4ffd61e17155b4fcbf0a9d7385ba2af0c725.tar.lz
dexon-sol-tools-08ba4ffd61e17155b4fcbf0a9d7385ba2af0c725.tar.xz
dexon-sol-tools-08ba4ffd61e17155b4fcbf0a9d7385ba2af0c725.tar.zst
dexon-sol-tools-08ba4ffd61e17155b4fcbf0a9d7385ba2af0c725.zip
Build website in parallel with other tests since no other test relies on it being built to run
-rw-r--r--.circleci/config.yml508
-rw-r--r--package.json1
-rw-r--r--packages/website/package.json1
3 files changed, 256 insertions, 254 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index f288a46e6..a848a4a0c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,257 +1,261 @@
version: 2
jobs:
- build:
- resource_class: medium+
- docker:
- - image: circleci/node:9
- environment:
- CONTRACTS_COMMIT_HASH: '9ed05f5'
- working_directory: ~/repo
- steps:
- - checkout
- - run: echo 'export PATH=$HOME/CIRCLE_PROJECT_REPONAME/node_modules/.bin:$PATH' >> $BASH_ENV
- - run:
- name: install-yarn
- command: sudo npm install --global yarn@1.9.4
- - run:
- name: yarn
- command: yarn --frozen-lockfile install || yarn --frozen-lockfile install
- - run: >
- if [ -z "$(git diff --name-only development packages/website)" ]; then
- yarn build:ci:no_website
- else
- yarn build:ci
- fi
- - save_cache:
- key: repo-{{ .Environment.CIRCLE_SHA1 }}
- paths:
- - ~/repo
- test-contracts-ganache:
- docker:
- - image: circleci/node:9
- working_directory: ~/repo
- steps:
- - restore_cache:
- keys:
- - repo-{{ .Environment.CIRCLE_SHA1 }}
- - run: yarn wsrun test:circleci contracts
- test-contracts-geth:
- docker:
- - image: circleci/node:9
- - image: 0xorg/devnet
- working_directory: ~/repo
- steps:
- - restore_cache:
- keys:
- - repo-{{ .Environment.CIRCLE_SHA1 }}
- # HACK(albrow): we need to sleep 10 seconds to ensure the devnet is
- # initialized
- - run: sleep 10 && TEST_PROVIDER=geth yarn wsrun test contracts
- test-publish:
- resource_class: medium+
- docker:
- - image: circleci/node:9
- - image: 0xorg/verdaccio
- working_directory: ~/repo
- steps:
- - restore_cache:
- keys:
- - repo-{{ .Environment.CIRCLE_SHA1 }}
- - run: yarn test:publish:circleci
- test-doc-generation:
- docker:
- - image: circleci/node:9
- working_directory: ~/repo
- steps:
- - restore_cache:
- keys:
- - repo-{{ .Environment.CIRCLE_SHA1 }}
- - run: yarn test:generate_docs:circleci
- test-rest:
- docker:
- - image: circleci/node:9
- working_directory: ~/repo
- steps:
- - restore_cache:
- keys:
- - repo-{{ .Environment.CIRCLE_SHA1 }}
- - run: yarn wsrun test:circleci @0xproject/abi-gen
- - run: yarn wsrun test:circleci @0xproject/assert
- - run: yarn wsrun test:circleci @0xproject/base-contract
- - run: yarn wsrun test:circleci @0xproject/connect
- - run: yarn wsrun test:circleci @0xproject/contract-wrappers
- - run: yarn wsrun test:circleci @0xproject/dev-utils
- - run: yarn wsrun test:circleci @0xproject/json-schemas
- - run: yarn wsrun test:circleci @0xproject/metacoin
- - run: yarn wsrun test:circleci @0xproject/order-utils
- - run: yarn wsrun test:circleci @0xproject/order-watcher
- - run: yarn wsrun test:circleci @0xproject/sol-compiler
- - run: yarn wsrun test:circleci @0xproject/sol-cov
- - run: yarn wsrun test:circleci @0xproject/sol-doc
- - run: yarn wsrun test:circleci @0xproject/sra-report
- - run: yarn wsrun test:circleci @0xproject/subproviders
- - run: yarn wsrun test:circleci @0xproject/web3-wrapper
- - run: yarn wsrun test:circleci @0xproject/utils
- - save_cache:
- key: coverage-abi-gen-{{ .Environment.CIRCLE_SHA1 }}
- paths:
- - ~/repo/packages/abi-gen/coverage/lcov.info
- - save_cache:
- key: coverage-assert-{{ .Environment.CIRCLE_SHA1 }}
- paths:
- - ~/repo/packages/assert/coverage/lcov.info
- - save_cache:
- key: coverage-base-contract-{{ .Environment.CIRCLE_SHA1 }}
- paths:
- - ~/repo/packages/base-contract/coverage/lcov.info
- - save_cache:
- key: coverage-connect-{{ .Environment.CIRCLE_SHA1 }}
- paths:
- - ~/repo/packages/connect/coverage/lcov.info
- - save_cache:
- key: coverage-contract-wrappers-{{ .Environment.CIRCLE_SHA1 }}
- paths:
- - ~/repo/packages/contract-wrappers/coverage/lcov.info
- - save_cache:
- key: coverage-dev-utils-{{ .Environment.CIRCLE_SHA1 }}
- paths:
- - ~/repo/packages/dev-utils/coverage/lcov.info
- - save_cache:
- key: coverage-json-schemas-{{ .Environment.CIRCLE_SHA1 }}
- paths:
- - ~/repo/packages/json-schemas/coverage/lcov.info
- - save_cache:
- key: coverage-metacoin-{{ .Environment.CIRCLE_SHA1 }}
- paths:
- - ~/repo/packages/metacoin/coverage/lcov.info
- - save_cache:
- key: coverage-order-utils-{{ .Environment.CIRCLE_SHA1 }}
- paths:
- - ~/repo/packages/order-utils/coverage/lcov.info
- - save_cache:
- key: coverage-order-watcher-{{ .Environment.CIRCLE_SHA1 }}
- paths:
- - ~/repo/packages/order-watcher/coverage/lcov.info
- - save_cache:
- key: coverage-sol-compiler-{{ .Environment.CIRCLE_SHA1 }}
- paths:
- - ~/repo/packages/sol-compiler/coverage/lcov.info
- - save_cache:
- key: coverage-sol-cov-{{ .Environment.CIRCLE_SHA1 }}
- paths:
- - ~/repo/packages/sol-cov/coverage/lcov.info
- - save_cache:
- key: coverage-sol-doc-{{ .Environment.CIRCLE_SHA1 }}
- paths:
- - ~/repo/packages/sol-doc/coverage/lcov.info
- - save_cache:
- key: coverage-sra-report-{{ .Environment.CIRCLE_SHA1 }}
- paths:
- - ~/repo/packages/sra-report/coverage/lcov.info
- - save_cache:
- key: coverage-subproviders-{{ .Environment.CIRCLE_SHA1 }}
- paths:
- - ~/repo/packages/subproviders/coverage/lcov.info
- - save_cache:
- key: coverage-web3-wrapper-{{ .Environment.CIRCLE_SHA1 }}
- paths:
- - ~/repo/packages/web3-wrapper/coverage/lcov.info
- static-tests:
- working_directory: ~/repo
- docker:
- - image: circleci/node:9
- steps:
- - restore_cache:
- keys:
- - repo-{{ .Environment.CIRCLE_SHA1 }}
- - run: yarn lerna run lint
- - run: yarn prettier:ci
- - run: cd packages/0x.js && yarn build:umd:prod
- - run: yarn bundlesize
- submit-coverage:
- docker:
- - image: circleci/node:9
- working_directory: ~/repo
- steps:
- - restore_cache:
- keys:
- - repo-{{ .Environment.CIRCLE_SHA1 }}
- - restore_cache:
- keys:
- - coverage-abi-gen-{{ .Environment.CIRCLE_SHA1 }}
- - restore_cache:
- keys:
- - coverage-assert-{{ .Environment.CIRCLE_SHA1 }}
- - restore_cache:
- keys:
- - coverage-base-contract-{{ .Environment.CIRCLE_SHA1 }}
- - restore_cache:
- keys:
- - coverage-connect-{{ .Environment.CIRCLE_SHA1 }}
- - restore_cache:
- keys:
- - coverage-contract-wrappers-{{ .Environment.CIRCLE_SHA1 }}
- - restore_cache:
- keys:
- - coverage-dev-utils-{{ .Environment.CIRCLE_SHA1 }}
- - restore_cache:
- keys:
- - coverage-json-schemas-{{ .Environment.CIRCLE_SHA1 }}
- - restore_cache:
- keys:
- - coverage-metacoin-{{ .Environment.CIRCLE_SHA1 }}
- - restore_cache:
- keys:
- - coverage-order-utils-{{ .Environment.CIRCLE_SHA1 }}
- - restore_cache:
- keys:
- - coverage-order-watcher-{{ .Environment.CIRCLE_SHA1 }}
- - restore_cache:
- keys:
- - coverage-sol-compiler-{{ .Environment.CIRCLE_SHA1 }}
- - restore_cache:
- keys:
- - coverage-sol-cov-{{ .Environment.CIRCLE_SHA1 }}
- - restore_cache:
- keys:
- - coverage-sol-doc-{{ .Environment.CIRCLE_SHA1 }}
- - restore_cache:
- keys:
- - coverage-sra-report-{{ .Environment.CIRCLE_SHA1 }}
- - restore_cache:
- keys:
- - coverage-subproviders-{{ .Environment.CIRCLE_SHA1 }}
- - restore_cache:
- keys:
- - coverage-web3-wrapper-{{ .Environment.CIRCLE_SHA1 }}
- - restore_cache:
- keys:
- - coverage-contracts-{{ .Environment.CIRCLE_SHA1 }}
- - run: yarn report_coverage
+ build:
+ resource_class: medium+
+ docker:
+ - image: circleci/node:9
+ environment:
+ CONTRACTS_COMMIT_HASH: '9ed05f5'
+ working_directory: ~/repo
+ steps:
+ - checkout
+ - run: echo 'export PATH=$HOME/CIRCLE_PROJECT_REPONAME/node_modules/.bin:$PATH' >> $BASH_ENV
+ - run:
+ name: install-yarn
+ command: sudo npm install --global yarn@1.9.4
+ - run:
+ name: yarn
+ command: yarn --frozen-lockfile install || yarn --frozen-lockfile install
+ - run: yarn build:ci:no_website
+ - save_cache:
+ key: repo-{{ .Environment.CIRCLE_SHA1 }}
+ paths:
+ - ~/repo
+ build-website:
+ docker:
+ - image: circleci/node:9
+ working_directory: ~/repo
+ steps:
+ - restore_cache:
+ keys:
+ - repo-{{ .Environment.CIRCLE_SHA1 }}
+ - run: cd packages/website && yarn build
+ test-contracts-ganache:
+ docker:
+ - image: circleci/node:9
+ working_directory: ~/repo
+ steps:
+ - restore_cache:
+ keys:
+ - repo-{{ .Environment.CIRCLE_SHA1 }}
+ - run: yarn wsrun test:circleci contracts
+ test-contracts-geth:
+ docker:
+ - image: circleci/node:9
+ - image: 0xorg/devnet
+ working_directory: ~/repo
+ steps:
+ - restore_cache:
+ keys:
+ - repo-{{ .Environment.CIRCLE_SHA1 }}
+ # HACK(albrow): we need to sleep 10 seconds to ensure the devnet is
+ # initialized
+ - run: sleep 10 && TEST_PROVIDER=geth yarn wsrun test contracts
+ test-publish:
+ resource_class: medium+
+ docker:
+ - image: circleci/node:9
+ - image: 0xorg/verdaccio
+ working_directory: ~/repo
+ steps:
+ - restore_cache:
+ keys:
+ - repo-{{ .Environment.CIRCLE_SHA1 }}
+ - run: yarn test:publish:circleci
+ test-doc-generation:
+ docker:
+ - image: circleci/node:9
+ working_directory: ~/repo
+ steps:
+ - restore_cache:
+ keys:
+ - repo-{{ .Environment.CIRCLE_SHA1 }}
+ - run: yarn test:generate_docs:circleci
+ test-rest:
+ docker:
+ - image: circleci/node:9
+ working_directory: ~/repo
+ steps:
+ - restore_cache:
+ keys:
+ - repo-{{ .Environment.CIRCLE_SHA1 }}
+ - run: yarn wsrun test:circleci @0xproject/abi-gen
+ - run: yarn wsrun test:circleci @0xproject/assert
+ - run: yarn wsrun test:circleci @0xproject/base-contract
+ - run: yarn wsrun test:circleci @0xproject/connect
+ - run: yarn wsrun test:circleci @0xproject/contract-wrappers
+ - run: yarn wsrun test:circleci @0xproject/dev-utils
+ - run: yarn wsrun test:circleci @0xproject/json-schemas
+ - run: yarn wsrun test:circleci @0xproject/metacoin
+ - run: yarn wsrun test:circleci @0xproject/order-utils
+ - run: yarn wsrun test:circleci @0xproject/order-watcher
+ - run: yarn wsrun test:circleci @0xproject/sol-compiler
+ - run: yarn wsrun test:circleci @0xproject/sol-cov
+ - run: yarn wsrun test:circleci @0xproject/sol-doc
+ - run: yarn wsrun test:circleci @0xproject/sra-report
+ - run: yarn wsrun test:circleci @0xproject/subproviders
+ - run: yarn wsrun test:circleci @0xproject/web3-wrapper
+ - run: yarn wsrun test:circleci @0xproject/utils
+ - save_cache:
+ key: coverage-abi-gen-{{ .Environment.CIRCLE_SHA1 }}
+ paths:
+ - ~/repo/packages/abi-gen/coverage/lcov.info
+ - save_cache:
+ key: coverage-assert-{{ .Environment.CIRCLE_SHA1 }}
+ paths:
+ - ~/repo/packages/assert/coverage/lcov.info
+ - save_cache:
+ key: coverage-base-contract-{{ .Environment.CIRCLE_SHA1 }}
+ paths:
+ - ~/repo/packages/base-contract/coverage/lcov.info
+ - save_cache:
+ key: coverage-connect-{{ .Environment.CIRCLE_SHA1 }}
+ paths:
+ - ~/repo/packages/connect/coverage/lcov.info
+ - save_cache:
+ key: coverage-contract-wrappers-{{ .Environment.CIRCLE_SHA1 }}
+ paths:
+ - ~/repo/packages/contract-wrappers/coverage/lcov.info
+ - save_cache:
+ key: coverage-dev-utils-{{ .Environment.CIRCLE_SHA1 }}
+ paths:
+ - ~/repo/packages/dev-utils/coverage/lcov.info
+ - save_cache:
+ key: coverage-json-schemas-{{ .Environment.CIRCLE_SHA1 }}
+ paths:
+ - ~/repo/packages/json-schemas/coverage/lcov.info
+ - save_cache:
+ key: coverage-metacoin-{{ .Environment.CIRCLE_SHA1 }}
+ paths:
+ - ~/repo/packages/metacoin/coverage/lcov.info
+ - save_cache:
+ key: coverage-order-utils-{{ .Environment.CIRCLE_SHA1 }}
+ paths:
+ - ~/repo/packages/order-utils/coverage/lcov.info
+ - save_cache:
+ key: coverage-order-watcher-{{ .Environment.CIRCLE_SHA1 }}
+ paths:
+ - ~/repo/packages/order-watcher/coverage/lcov.info
+ - save_cache:
+ key: coverage-sol-compiler-{{ .Environment.CIRCLE_SHA1 }}
+ paths:
+ - ~/repo/packages/sol-compiler/coverage/lcov.info
+ - save_cache:
+ key: coverage-sol-cov-{{ .Environment.CIRCLE_SHA1 }}
+ paths:
+ - ~/repo/packages/sol-cov/coverage/lcov.info
+ - save_cache:
+ key: coverage-sol-doc-{{ .Environment.CIRCLE_SHA1 }}
+ paths:
+ - ~/repo/packages/sol-doc/coverage/lcov.info
+ - save_cache:
+ key: coverage-sra-report-{{ .Environment.CIRCLE_SHA1 }}
+ paths:
+ - ~/repo/packages/sra-report/coverage/lcov.info
+ - save_cache:
+ key: coverage-subproviders-{{ .Environment.CIRCLE_SHA1 }}
+ paths:
+ - ~/repo/packages/subproviders/coverage/lcov.info
+ - save_cache:
+ key: coverage-web3-wrapper-{{ .Environment.CIRCLE_SHA1 }}
+ paths:
+ - ~/repo/packages/web3-wrapper/coverage/lcov.info
+ static-tests:
+ working_directory: ~/repo
+ docker:
+ - image: circleci/node:9
+ steps:
+ - restore_cache:
+ keys:
+ - repo-{{ .Environment.CIRCLE_SHA1 }}
+ - run: yarn lerna run lint
+ - run: yarn prettier:ci
+ - run: cd packages/0x.js && yarn build:umd:prod
+ - run: yarn bundlesize
+ submit-coverage:
+ docker:
+ - image: circleci/node:9
+ working_directory: ~/repo
+ steps:
+ - restore_cache:
+ keys:
+ - repo-{{ .Environment.CIRCLE_SHA1 }}
+ - restore_cache:
+ keys:
+ - coverage-abi-gen-{{ .Environment.CIRCLE_SHA1 }}
+ - restore_cache:
+ keys:
+ - coverage-assert-{{ .Environment.CIRCLE_SHA1 }}
+ - restore_cache:
+ keys:
+ - coverage-base-contract-{{ .Environment.CIRCLE_SHA1 }}
+ - restore_cache:
+ keys:
+ - coverage-connect-{{ .Environment.CIRCLE_SHA1 }}
+ - restore_cache:
+ keys:
+ - coverage-contract-wrappers-{{ .Environment.CIRCLE_SHA1 }}
+ - restore_cache:
+ keys:
+ - coverage-dev-utils-{{ .Environment.CIRCLE_SHA1 }}
+ - restore_cache:
+ keys:
+ - coverage-json-schemas-{{ .Environment.CIRCLE_SHA1 }}
+ - restore_cache:
+ keys:
+ - coverage-metacoin-{{ .Environment.CIRCLE_SHA1 }}
+ - restore_cache:
+ keys:
+ - coverage-order-utils-{{ .Environment.CIRCLE_SHA1 }}
+ - restore_cache:
+ keys:
+ - coverage-order-watcher-{{ .Environment.CIRCLE_SHA1 }}
+ - restore_cache:
+ keys:
+ - coverage-sol-compiler-{{ .Environment.CIRCLE_SHA1 }}
+ - restore_cache:
+ keys:
+ - coverage-sol-cov-{{ .Environment.CIRCLE_SHA1 }}
+ - restore_cache:
+ keys:
+ - coverage-sol-doc-{{ .Environment.CIRCLE_SHA1 }}
+ - restore_cache:
+ keys:
+ - coverage-sra-report-{{ .Environment.CIRCLE_SHA1 }}
+ - restore_cache:
+ keys:
+ - coverage-subproviders-{{ .Environment.CIRCLE_SHA1 }}
+ - restore_cache:
+ keys:
+ - coverage-web3-wrapper-{{ .Environment.CIRCLE_SHA1 }}
+ - restore_cache:
+ keys:
+ - coverage-contracts-{{ .Environment.CIRCLE_SHA1 }}
+ - run: yarn report_coverage
workflows:
- version: 2
- main:
- jobs:
- - build
- - test-contracts-ganache:
- requires:
+ version: 2
+ main:
+ jobs:
- build
- - test-contracts-geth:
- requires:
- - build
- - test-rest:
- requires:
- - build
- - static-tests:
- requires:
- - build
- - test-publish:
- requires:
- - build
- - test-doc-generation:
- requires:
- - build
- - submit-coverage:
- requires:
- - test-rest
+ - test-contracts-ganache:
+ requires:
+ - build
+ - test-contracts-geth:
+ requires:
+ - build
+ - test-rest:
+ requires:
+ - build
+ - static-tests:
+ requires:
+ - build
+ - test-publish:
+ requires:
+ - build
+ - test-doc-generation:
+ requires:
+ - build
+ - submit-coverage:
+ requires:
+ - test-rest
diff --git a/package.json b/package.json
index 600569386..8eb736cc4 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,6 @@
"wsrun": "wsrun",
"lerna": "lerna",
"build": "wsrun build $PKG --fast-exit -r --stages",
- "build:ci": "wsrun build:ci $PKG --fast-exit -r --stages",
"build:no_website": "wsrun build $PKG --fast-exit -r --stages --exclude @0xproject/website",
"build:ci:no_website": "wsrun build:ci $PKG --fast-exit -r --stages --exclude @0xproject/website",
"build:monorepo_scripts": "PKG=@0xproject/monorepo-scripts yarn build",
diff --git a/packages/website/package.json b/packages/website/package.json
index 530f71677..3cf243645 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -9,7 +9,6 @@
"scripts": {
"build": "node --max_old_space_size=8192 ../../node_modules/.bin/webpack --mode production",
"build:dev": "../../node_modules/.bin/webpack --mode development",
- "build:ci": "yarn build",
"clean": "shx rm -f public/bundle*",
"lint": "tslint --project . 'ts/**/*.ts' 'ts/**/*.tsx'",
"dev": "webpack-dev-server --mode development --content-base public --https",