From 754f2306da57811202d70e7bf3f594ad97ea49b0 Mon Sep 17 00:00:00 2001 From: Paulo Rezende Date: Sun, 10 Jun 2018 12:55:30 -0300 Subject: [PATCH 1/6] Updates CircleCI config to use API version 2.0 --- .circleci/config.yml | 10 ++++++++++ circle.yml | 11 ----------- 2 files changed, 10 insertions(+), 11 deletions(-) create mode 100644 .circleci/config.yml delete mode 100644 circle.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..6b39a96 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,10 @@ +version: 2 +jobs: + build: + docker: + - image: circleci/node:8.11.2 + steps: + - checkout + - run: npm install + - run: npm test + - run: npm run coveralls diff --git a/circle.yml b/circle.yml deleted file mode 100644 index 646fc4a..0000000 --- a/circle.yml +++ /dev/null @@ -1,11 +0,0 @@ -machine: - node: - version: 8.11.1 - -dependencies: - override: - - npm install - -test: - override: - - npm test From 2412c10459df81d1d0f25216a508743b058c7fd1 Mon Sep 17 00:00:00 2001 From: Paulo Rezende Date: Sun, 10 Jun 2018 12:57:57 -0300 Subject: [PATCH 2/6] Adds Coveralls config file --- .coveralls.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .coveralls.yml diff --git a/.coveralls.yml b/.coveralls.yml new file mode 100644 index 0000000..71c6be4 --- /dev/null +++ b/.coveralls.yml @@ -0,0 +1 @@ +repo_token: From 164f438d55b0d31f3fe3707c6ba8ca5924fcda22 Mon Sep 17 00:00:00 2001 From: Paulo Rezende Date: Thu, 14 Jun 2018 10:19:46 -0300 Subject: [PATCH 3/6] Remove Coveralls config file --- .coveralls.yml | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .coveralls.yml diff --git a/.coveralls.yml b/.coveralls.yml deleted file mode 100644 index 71c6be4..0000000 --- a/.coveralls.yml +++ /dev/null @@ -1 +0,0 @@ -repo_token: From 49c8bb2015f7dbeb92db6dae9b0bb0f2b1daa3ba Mon Sep 17 00:00:00 2001 From: Paulo Rezende Date: Thu, 14 Jun 2018 10:20:49 -0300 Subject: [PATCH 4/6] Remove step to run Coveralls tests on CircleCI config file --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6b39a96..db8a63f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,4 +7,3 @@ jobs: - checkout - run: npm install - run: npm test - - run: npm run coveralls From 734d682ea91ccc1c4223969299491b7e71f784b1 Mon Sep 17 00:00:00 2001 From: Paulo Rezende Date: Wed, 11 Jul 2018 19:23:59 -0300 Subject: [PATCH 5/6] Remove .circleci and add circle.yml to the root --- .circleci/config.yml => circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .circleci/config.yml => circle.yml (75%) diff --git a/.circleci/config.yml b/circle.yml similarity index 75% rename from .circleci/config.yml rename to circle.yml index db8a63f..fbfebc5 100644 --- a/.circleci/config.yml +++ b/circle.yml @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: circleci/node:8.11.2 + - image: circleci/node:8.11.3 steps: - checkout - run: npm install From 43f1ab327c3e8a92685f97d69314ecfe11079452 Mon Sep 17 00:00:00 2001 From: Paulo Rezende Date: Wed, 11 Jul 2018 19:24:26 -0300 Subject: [PATCH 6/6] Update circleci config on template --- generators/app/templates/circle.yml.template | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/generators/app/templates/circle.yml.template b/generators/app/templates/circle.yml.template index 646fc4a..fbfebc5 100644 --- a/generators/app/templates/circle.yml.template +++ b/generators/app/templates/circle.yml.template @@ -1,11 +1,9 @@ -machine: - node: - version: 8.11.1 - -dependencies: - override: - - npm install - -test: - override: - - npm test +version: 2 +jobs: + build: + docker: + - image: circleci/node:8.11.3 + steps: + - checkout + - run: npm install + - run: npm test