From 04ddadc48fb9553bbf9074c48b47c674d8e24ad1 Mon Sep 17 00:00:00 2001 From: xinbenlv Date: Wed, 7 Aug 2019 09:25:34 -0700 Subject: [PATCH] Add CircleCI configuration (#1841) * Add circlci, remove .travis.yml. Fixes #1839. * Fix circleci config * Add slack notification * Add circleci status * Fix config.yml, we don't need separate truffle image and instances. * Matches oz-sdk node version * Seems node:10.13 doesn't work for CircleCI either * Remove npm update in circleci * CircleCI use package-lock.json as cache key and install only the lock version * Add back travis.yml * Rename job build to test * CircleCI requires that job to be called build instead of test or build_and_test * Fix the way to run jobs * Fix CircleCI * Change back to npm install * Add workflow and split into tasks * Add workspace * Restore cache * update readme circleci instructions * make step name more accurate --- .circleci/config.yml | 97 ++++++++++++++++++++++++++++++++++++++++++++ CONTRIBUTING.md | 18 +++++++- 2 files changed, 113 insertions(+), 2 deletions(-) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 000000000..7fe002d3c --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,97 @@ +version: 2 +# 2.1 does not yet support local run +# unless with workaround. For simplicity just use it. +# https://github.com/CircleCI-Public/circleci-cli/issues/79 + +jobs: + build: + docker: + - image: circleci/node:8 + working_directory: ~/project + steps: + - checkout + - attach_workspace: + at: ~/project + # Download and cache dependencies + - restore_cache: + keys: + - v1-dependencies-{{ checksum "package-lock.json" }} + # fallback to using the latest cache if no exact match is found + - v1-dependencies- + - run: + name: Install npm dependencies + command: npm install + + - save_cache: + paths: + - node_modules + key: v1-dependencies-{{ checksum "package-lock.json" }} + + lint: + docker: + - image: circleci/node:8 + working_directory: ~/project + steps: + - checkout + - attach_workspace: + at: ~/project + - restore_cache: + keys: + - v1-dependencies-{{ checksum "package-lock.json" }} + # fallback to using the latest cache if no exact match is found + - v1-dependencies- + - run: + name: Linter + command: npm run lint + test: + docker: + - image: circleci/node:8 + working_directory: ~/project + steps: + - checkout + - attach_workspace: + at: ~/project + - restore_cache: + keys: + - v1-dependencies-{{ checksum "package-lock.json" }} + # fallback to using the latest cache if no exact match is found + - v1-dependencies- + - run: + name: Unit tests + command: npm run test + coverage: + docker: + - image: circleci/node:8 + working_directory: ~/project + steps: + - checkout + - attach_workspace: + at: ~/project + - restore_cache: + keys: + - v1-dependencies-{{ checksum "package-lock.json" }} + # fallback to using the latest cache if no exact match is found + - v1-dependencies- + - run: + name: Unit tests with coverage report + command: npm run test + environment: + SOLIDITY_COVERAGE: true + + # TODO(xinbenlv, #1839): run SOLC_NIGHTLY to be run but allow it to fail. + # TODO(xinbenlv, #1839): requires SLACK WEBHOOK to be setup by repo owner. + +workflows: + version: 2 + everything: + jobs: + - build + - lint: + requires: + - build + - test: + requires: + - build + - coverage: + requires: + - build diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 76e2c35bd..dd7c37637 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -37,12 +37,26 @@ git commit "Fix some bug #123" git push origin fix/some-bug-#123 ``` -4) Go to [github.com/OpenZeppelin/openzeppelin-contracts](https://github.com/OpenZeppelin/openzeppelin-contracts) in your web browser and issue a new pull request. +4) Run tests, linter etc. It can be done by running local continuous integration and make sure it pass + +```bash +npm test +npm linter +``` + +or you can simply run CircleCI locally +```bash +circleci local execute --job build +circleci local execute --job test +``` +*Note*: requires installing CircleCI and docker locally on your machine. + +5) Go to [github.com/OpenZeppelin/openzeppelin-contracts](https://github.com/OpenZeppelin/openzeppelin-contracts) in your web browser and issue a new pull request. *IMPORTANT* Read the PR template very carefully and make sure to follow all the instructions. These instructions refer to some very important conditions that your PR must meet in order to be accepted, such as making sure that all tests pass, JS linting tests pass, solidity linting tests pass, etc. -5) Maintainers will review your code and possibly ask for changes before your code is pulled in to the main repository. We'll check that all tests pass, review the coding style, and check for general code correctness. If everything is OK, we'll merge your pull request and your code will be part of OpenZeppelin. +6) Maintainers will review your code and possibly ask for changes before your code is pulled in to the main repository. We'll check that all tests pass, review the coding style, and check for general code correctness. If everything is OK, we'll merge your pull request and your code will be part of OpenZeppelin. *IMPORTANT* Please pay attention to the maintainer's feedback, since its a necessary step to keep up with the standards OpenZeppelin attains to.