From c0553fa9eb4675a4cc9bfbf773ae8bfe782ab6a6 Mon Sep 17 00:00:00 2001 From: Lawrence Forman Date: Tue, 7 Apr 2020 14:04:44 -0400 Subject: [PATCH] Add `@0x/contracts-zero-ex` project to monorepo. Tweak circleci config to avoid running out of memory. --- .circleci/config.yml | 46 ++++++++++++++++++++++---------------------- .gitignore | 4 ++++ .prettierignore | 4 ++++ package.json | 4 ++-- 4 files changed, 33 insertions(+), 25 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2516be2251..9ab5e60baf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,17 +38,7 @@ jobs: path: ~/repo/packages/abi-gen/test-cli/output - store_artifacts: path: ~/repo/packages/contract-wrappers/generated_docs - test-contracts-ganache: - resource_class: medium+ - docker: - - image: nikolaik/python-nodejs:python3.7-nodejs8 - working_directory: ~/repo - steps: - - restore_cache: - keys: - - repo-{{ .Environment.CIRCLE_SHA1 }} - - run: yarn wsrun test:circleci @0x/contracts-multisig @0x/contracts-utils @0x/contracts-exchange-libs @0x/contracts-erc20 @0x/contracts-erc721 @0x/contracts-erc1155 @0x/contracts-extensions @0x/contracts-asset-proxy @0x/contracts-exchange @0x/contracts-exchange-forwarder @0x/contracts-coordinator @0x/contracts-staking - test-exchange-ganache-3.0: + test-exchange-ganache: resource_class: medium+ docker: - image: nikolaik/python-nodejs:python3.7-nodejs8 @@ -58,7 +48,7 @@ jobs: keys: - repo-{{ .Environment.CIRCLE_SHA1 }} - run: yarn wsrun test:circleci @0x/contracts-exchange - test-integrations-ganache-3.0: + test-integrations-ganache: resource_class: medium+ docker: - image: nikolaik/python-nodejs:python3.7-nodejs8 @@ -68,7 +58,7 @@ jobs: keys: - repo-{{ .Environment.CIRCLE_SHA1 }} - run: yarn wsrun test:circleci @0x/contracts-integrations - test-contracts-rest-ganache-3.0: + test-contracts-staking-ganache: resource_class: medium+ docker: - image: nikolaik/python-nodejs:python3.7-nodejs8 @@ -77,11 +67,17 @@ jobs: - restore_cache: keys: - repo-{{ .Environment.CIRCLE_SHA1 }} - - run: yarn wsrun test:circleci @0x/contracts-multisig @0x/contracts-utils @0x/contracts-exchange-libs @0x/contracts-erc20 @0x/contracts-erc721 @0x/contracts-erc1155 @0x/contracts-asset-proxy @0x/contracts-exchange-forwarder @0x/contracts-staking @0x/contracts-coordinator @0x/contracts-erc20-bridge-sampler - # TODO(dorothy-zbornak): Re-enable after updating this package for - # 3.0. At that time, also remove exclusion from monorepo - # package.json's test script. - # - run: yarn wsrun test:circleci @0x/contracts-extensions + - run: yarn wsrun test:circleci @0x/contracts-staking + test-contracts-rest-ganache: + resource_class: medium+ + docker: + - image: nikolaik/python-nodejs:python3.7-nodejs8 + working_directory: ~/repo + steps: + - restore_cache: + keys: + - repo-{{ .Environment.CIRCLE_SHA1 }} + - run: yarn wsrun test:circleci @0x/contracts-multisig @0x/contracts-utils @0x/contracts-exchange-libs @0x/contracts-erc20 @0x/contracts-erc721 @0x/contracts-erc1155 @0x/contracts-asset-proxy @0x/contracts-exchange-forwarder @0x/contracts-coordinator @0x/contracts-erc20-bridge-sampler @0x/contracts-zero-ex test-publish: resource_class: medium+ docker: @@ -419,13 +415,16 @@ workflows: main: jobs: - build - - test-exchange-ganache-3.0: + - test-exchange-ganache: requires: - build - - test-integrations-ganache-3.0: + - test-integrations-ganache: requires: - build - - test-contracts-rest-ganache-3.0: + - test-contracts-staking-ganache: + requires: + - build + - test-contracts-rest-ganache: requires: - build - test-rest: @@ -442,8 +441,9 @@ workflows: - build - submit-coverage: requires: - - test-contracts-rest-ganache-3.0 - - test-exchange-ganache-3.0 + - test-contracts-rest-ganache + - test-contracts-staking-ganache + - test-exchange-ganache - test-rest - static-tests - test-python: diff --git a/.gitignore b/.gitignore index 3e550c43cb..9a7d8ffc5e 100644 --- a/.gitignore +++ b/.gitignore @@ -111,6 +111,8 @@ contracts/exchange-forwarder/generated-artifacts/ contracts/exchange-forwarder/test/generated-artifacts/ contracts/dev-utils/generated-artifacts/ contracts/dev-utils/test/generated-artifacts/ +contracts/zero-ex/generated-artifacts/ +contracts/zero-ex/test/generated-artifacts/ packages/sol-tracing-utils/test/fixtures/artifacts/ python-packages/contract_artifacts/src/zero_ex/contract_artifacts/artifacts/ @@ -165,6 +167,8 @@ contracts/exchange-forwarder/generated-wrappers/ contracts/exchange-forwarder/test/generated-wrappers/ contracts/dev-utils/generated-wrappers/ contracts/dev-utils/test/generated-wrappers/ +contracts/zero-ex/generated-wrappers/ +contracts/zero-ex/test/generated-wrappers/ python-packages/contract_wrappers/src/zero_ex/contract_wrappers/*/__init__.py # solc-bin in sol-compiler diff --git a/.prettierignore b/.prettierignore index c3dcb2e657..fb54998581 100644 --- a/.prettierignore +++ b/.prettierignore @@ -64,6 +64,10 @@ lib /contracts/dev-utils/test/generated-wrappers /contracts/dev-utils/generated-artifacts /contracts/dev-utils/test/generated-artifacts +/contracts/zero-ex/generated-wrappers +/contracts/zero-ex/test/generated-wrappers +/contracts/zero-ex/generated-artifacts +/contracts/zero-ex/test/generated-artifacts /contracts/staking/build/ /contracts/coordinator/build/ /contracts/exchange/build/ diff --git a/package.json b/package.json index b8033a3add..65fd3c1c81 100644 --- a/package.json +++ b/package.json @@ -51,9 +51,9 @@ "lint:contracts": "wsrun lint -p ${npm_package_config_contractsPackages} -c --fast-exit --stages --exclude-missing" }, "config": { - "contractsPackages": "@0x/contracts-asset-proxy @0x/contracts-dev-utils @0x/contracts-erc20 @0x/contracts-erc20-bridge-sampler @0x/contracts-erc721 @0x/contracts-erc1155 @0x/contracts-exchange @0x/contracts-exchange-forwarder @0x/contracts-exchange-libs @0x/contracts-integrations @0x/contracts-multisig @0x/contracts-staking @0x/contracts-test-utils @0x/contracts-utils @0x/contracts-coordinator @0x/contracts-erc20-bridge-sampler @0x/contracts-broker", + "contractsPackages": "@0x/contracts-asset-proxy @0x/contracts-dev-utils @0x/contracts-erc20 @0x/contracts-erc20-bridge-sampler @0x/contracts-erc721 @0x/contracts-erc1155 @0x/contracts-exchange @0x/contracts-exchange-forwarder @0x/contracts-exchange-libs @0x/contracts-integrations @0x/contracts-multisig @0x/contracts-staking @0x/contracts-test-utils @0x/contracts-utils @0x/contracts-coordinator @0x/contracts-erc20-bridge-sampler @0x/contracts-broker @0x/contracts-zero-ex", "mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic", - "packagesWithDocPages": "0x.js @0x/contract-wrappers @0x/connect @0x/json-schemas @0x/subproviders @0x/web3-wrapper @0x/order-utils @0x/sol-compiler @0x/sol-coverage @0x/sol-profiler @0x/sol-trace @0x/dev-utils @0x/asset-swapper @0x/migrations @0x/orderbook @0x/contracts-asset-proxy @0x/contracts-coordinator @0x/contracts-dev-utils @0x/contracts-erc20 @0x/contracts-erc721 @0x/contracts-erc1155 @0x/contracts-exchange @0x/contracts-exchange-forwarder @0x/contracts-exchange-libs @0x/contracts-extensions @0x/contracts-staking", + "packagesWithDocPages": "0x.js @0x/contract-wrappers @0x/connect @0x/json-schemas @0x/subproviders @0x/web3-wrapper @0x/order-utils @0x/sol-compiler @0x/sol-coverage @0x/sol-profiler @0x/sol-trace @0x/dev-utils @0x/asset-swapper @0x/migrations @0x/orderbook @0x/contracts-asset-proxy @0x/contracts-coordinator @0x/contracts-dev-utils @0x/contracts-erc20 @0x/contracts-erc721 @0x/contracts-erc1155 @0x/contracts-exchange @0x/contracts-exchange-forwarder @0x/contracts-exchange-libs @0x/contracts-extensions @0x/contracts-staking @0x/contracts-zero-ex", "ignoreDependencyVersions": "@types/styled-components @types/node", "ignoreDependencyVersionsForPackage": "instant contract-wrappers" },