From 0f5b9336c03be02bc0e8c11b9d6d8c4f269b991a Mon Sep 17 00:00:00 2001 From: Rodrigo Gomes da Silva Date: Mon, 17 Dec 2018 19:59:13 -0200 Subject: [PATCH 1/3] Update config.yml --- .circleci/config.yml | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 86e4b5f..0c43cc6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,8 +1,8 @@ version: 2 -jobs: - build: + +commands: + test: docker: - - image: circleci/node:8.11.3 - image: circleci/mysql:5.5 environment: MYSQL_ROOT_PASSWORD: 'root' @@ -41,5 +41,31 @@ jobs: name: Run tests/coverage command: | npm run coverage - ./cc-test-reporter format-coverage -t lcov -o coverage.json coverage/lcov.info - ./cc-test-reporter upload-coverage -i coverage.json + if [ "${CIRCLE_BRANCH}" == "master" ]; then + ./cc-test-reporter format-coverage -t lcov -o coverage.json coverage/lcov.info + ./cc-test-reporter upload-coverage -i coverage.json + fi + +jobs: + node-8: + docker: + - image: circleci/node:8.11.3 + steps: + - test + node-10: + docker: + - image: circleci/node:10.14.2 + steps: + - test + node-11: + docker: + - image: circleci/node:11.4.0 + steps: + - test + +workflows: + node-multi-build: + jobs: + - node-8 + - node-10 + - node-11 From 5c8c5cb74348174c48d7931d17c257437023f917 Mon Sep 17 00:00:00 2001 From: Rodrigo Gomes da Silva Date: Tue, 18 Dec 2018 23:44:49 -0200 Subject: [PATCH 2/3] Update config.yml --- .circleci/config.yml | 37 +++++-------------------------------- 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0c43cc6..a1b49be 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,8 +1,8 @@ version: 2 - -commands: - test: +jobs: + build: docker: + - image: circleci/node:8.11.3 - image: circleci/mysql:5.5 environment: MYSQL_ROOT_PASSWORD: 'root' @@ -23,7 +23,6 @@ commands: command: | curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter chmod +x ./cc-test-reporter - - run: name: Install dependencies command: npm install @@ -41,31 +40,5 @@ commands: name: Run tests/coverage command: | npm run coverage - if [ "${CIRCLE_BRANCH}" == "master" ]; then - ./cc-test-reporter format-coverage -t lcov -o coverage.json coverage/lcov.info - ./cc-test-reporter upload-coverage -i coverage.json - fi - -jobs: - node-8: - docker: - - image: circleci/node:8.11.3 - steps: - - test - node-10: - docker: - - image: circleci/node:10.14.2 - steps: - - test - node-11: - docker: - - image: circleci/node:11.4.0 - steps: - - test - -workflows: - node-multi-build: - jobs: - - node-8 - - node-10 - - node-11 + ./cc-test-reporter format-coverage -t lcov -o coverage.json coverage/lcov.info + ./cc-test-reporter upload-coverage -i coverage.json From c6d94d70576abe7768f3848d9152b774e4fb2a44 Mon Sep 17 00:00:00 2001 From: Rodrigo Gomes da Silva Date: Tue, 18 Dec 2018 23:45:05 -0200 Subject: [PATCH 3/3] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a1b49be..3133a29 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: circleci/node:8.11.3 + - image: circleci/node:10 - image: circleci/mysql:5.5 environment: MYSQL_ROOT_PASSWORD: 'root'