From b0e0aebd8c8013aa08a9d277929e1c5e8bed1c1c Mon Sep 17 00:00:00 2001 From: LecomteAdrien Date: Mon, 2 Nov 2020 09:59:15 +0100 Subject: [PATCH 01/16] Install step --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 39f08f1..7666b7a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ jobs: auth: username: mydockerhub-user password: $DOCKERHUB_PASSWORD # context / project UI env-var reference - steps: + steps: yarn - checkout # check out the code in the project directory - - run: echo "hello world" # run the `echo` command qsdsqd - \ No newline at end of file + - run: yarn global add node-gyp && yarn install + - run: npm-v1-dependencies-{{ checksum "yarn.lock" }} \ No newline at end of file From 13c7287b2ba9865ecc9884c305c8cc0df2f7240e Mon Sep 17 00:00:00 2001 From: LecomteAdrien Date: Mon, 2 Nov 2020 10:00:41 +0100 Subject: [PATCH 02/16] Update config.yml --- .circleci/config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7666b7a..1a92a88 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,5 +8,6 @@ jobs: password: $DOCKERHUB_PASSWORD # context / project UI env-var reference steps: yarn - checkout # check out the code in the project directory - - run: yarn global add node-gyp && yarn install - - run: npm-v1-dependencies-{{ checksum "yarn.lock" }} \ No newline at end of file + - command: | + yarn global add node-gyp && yarn install + npm-v1-dependencies-{{ checksum "yarn.lock" }} \ No newline at end of file From 98dc47c81ee614514d48e4bdfaa1d93093d119fb Mon Sep 17 00:00:00 2001 From: LecomteAdrien Date: Mon, 2 Nov 2020 10:02:18 +0100 Subject: [PATCH 03/16] Update config.yml --- .circleci/config.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1a92a88..80d320c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,6 +8,10 @@ jobs: password: $DOCKERHUB_PASSWORD # context / project UI env-var reference steps: yarn - checkout # check out the code in the project directory - - command: | - yarn global add node-gyp && yarn install - npm-v1-dependencies-{{ checksum "yarn.lock" }} \ No newline at end of file +- run: + name: The First Step + command: | + echo 'Hello World!' + echo 'This is the delivery pipeline' + yarn global add node-gyp && yarn install + npm-v1-dependencies-{{ checksum "yarn.lock" }} \ No newline at end of file From 3c6dfe558adf12055c767dc953330fec4498be4f Mon Sep 17 00:00:00 2001 From: LecomteAdrien Date: Mon, 2 Nov 2020 10:06:19 +0100 Subject: [PATCH 04/16] Update config.yml --- .circleci/config.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 80d320c..ff07048 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,17 +1,14 @@ version: 2.1 jobs: build: - docker: - - image: cimg/node:14.10.1 # the primary container, where your job's commands are run + docker: + - image: alpine:3.7 auth: username: mydockerhub-user password: $DOCKERHUB_PASSWORD # context / project UI env-var reference - steps: yarn - - checkout # check out the code in the project directory -- run: + steps: + - run: name: The First Step command: | echo 'Hello World!' - echo 'This is the delivery pipeline' - yarn global add node-gyp && yarn install - npm-v1-dependencies-{{ checksum "yarn.lock" }} \ No newline at end of file + echo 'This is the delivery pipeline' \ No newline at end of file From c7ae1591e3b915ef5530bff21c15fbd8e55a6458 Mon Sep 17 00:00:00 2001 From: LecomteAdrien Date: Mon, 2 Nov 2020 10:07:35 +0100 Subject: [PATCH 05/16] 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 ff07048..0cdb277 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,4 +11,4 @@ jobs: name: The First Step command: | echo 'Hello World!' - echo 'This is the delivery pipeline' \ No newline at end of file + yarn global add node-gyp && yarn install \ No newline at end of file From 725436c23002f455ea7c912204550de080a5a1ee Mon Sep 17 00:00:00 2001 From: LecomteAdrien Date: Mon, 2 Nov 2020 10:09:44 +0100 Subject: [PATCH 06/16] Update config.yml --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0cdb277..b5755db 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,4 +11,5 @@ jobs: name: The First Step command: | echo 'Hello World!' + npm-v1-dependencies-{{ checksum "yarn.lock" }} yarn global add node-gyp && yarn install \ No newline at end of file From 4e16efdbc9aae1c00ba052f9b4c7604d40c57df9 Mon Sep 17 00:00:00 2001 From: LecomteAdrien Date: Mon, 2 Nov 2020 10:17:33 +0100 Subject: [PATCH 07/16] Update config.yml --- .circleci/config.yml | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b5755db..f6311d5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,14 +2,28 @@ version: 2.1 jobs: build: docker: - - image: alpine:3.7 + - image: cimg/node:14.10.1 auth: username: mydockerhub-user password: $DOCKERHUB_PASSWORD # context / project UI env-var reference - steps: - - run: + steps: # dans les steps faut mettre un restore et un save avec la key et un path de cache pour le save + - checkout + - run : echo 'Hello World!' + - run: yarn global add node-gyp && yarn install + - restore_cache: + key: yarn-packages-{{ checksum "yarn.lock" }} + - save_cache: + key: yarn-packages-{{ checksum "yarn.lock" }} + paths: + - ~/.cache/yarn name: The First Step - command: | - echo 'Hello World!' - npm-v1-dependencies-{{ checksum "yarn.lock" }} - yarn global add node-gyp && yarn install \ No newline at end of file + + + + + + + + + + From 4c86a2b74f1e76bcc8219d2ecf62543e0f507621 Mon Sep 17 00:00:00 2001 From: LecomteAdrien Date: Mon, 2 Nov 2020 10:19:22 +0100 Subject: [PATCH 08/16] Update config.yml --- .circleci/config.yml | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f6311d5..969b45c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,23 +1,17 @@ version: 2.1 jobs: build: - docker: - - image: cimg/node:14.10.1 - auth: - username: mydockerhub-user - password: $DOCKERHUB_PASSWORD # context / project UI env-var reference - steps: # dans les steps faut mettre un restore et un save avec la key et un path de cache pour le save - - checkout - - run : echo 'Hello World!' - - run: yarn global add node-gyp && yarn install - - restore_cache: - key: yarn-packages-{{ checksum "yarn.lock" }} - - save_cache: - key: yarn-packages-{{ checksum "yarn.lock" }} - paths: - - ~/.cache/yarn - name: The First Step - + docker: + - image: cimg/node:14.10.1 # the primary container, where your job's commands are run + steps: + - checkout # check out the code in the project directory + - run: yarn global add node-gyp && yarn install + - restore_cache: + key: yarn-packages-{{ checksum "yarn.lock" }} + - save_cache: + key: yarn-packages-{{ checksum "yarn.lock" }} + paths: + - ~/.cache/yarn From c94abd4dd773eb7470359dfb90b07545871c1d0c Mon Sep 17 00:00:00 2001 From: LecomteAdrien Date: Mon, 2 Nov 2020 10:22:16 +0100 Subject: [PATCH 09/16] Update config.yml --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 969b45c..faa074e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,6 +5,7 @@ jobs: - image: cimg/node:14.10.1 # the primary container, where your job's commands are run steps: - checkout # check out the code in the project directory + - run: echo "hello world" - run: yarn global add node-gyp && yarn install - restore_cache: key: yarn-packages-{{ checksum "yarn.lock" }} From f289b5dcbc785d6f23cf6353ffba303542c11e18 Mon Sep 17 00:00:00 2001 From: LecomteAdrien Date: Mon, 2 Nov 2020 11:10:01 +0100 Subject: [PATCH 10/16] yarn --- .circleci/config.yml | 44 +++++++++++++++++++++++++++++--------------- package.json | 5 ++--- 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index faa074e..98dd332 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,24 +1,38 @@ +workflows: version: 2.1 + build_and_test: + jobs: + - install + - yarn: + requires: + - install + - test: + requires: + - install + jobs: - build: - docker: + build: install + docker: - image: cimg/node:14.10.1 # the primary container, where your job's commands are run + steps: - - checkout # check out the code in the project directory - - run: echo "hello world" - - run: yarn global add node-gyp && yarn install + - checkout - restore_cache: key: yarn-packages-{{ checksum "yarn.lock" }} + - run: yarn global add node-gyp && yarn install + - save_cache: key: yarn-packages-{{ checksum "yarn.lock" }} paths: - - ~/.cache/yarn - - - - - - - - - + - ~/.cache/yarn + test: + steps: + - checkout + - restore_cache: + key: yarn-packages-{{ checksum "yarn.lock" }} + - run: yarn lint && yarn format:check + - run: yarn test:ci + - save_cache: + key: yarn-packages-{{ checksum "yarn.lock" }} + paths: + - ./node_modules \ No newline at end of file diff --git a/package.json b/package.json index a4f54c1..3f9033c 100644 --- a/package.json +++ b/package.json @@ -20,9 +20,8 @@ "test:cov": "jest --coverage", "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand", "test:e2e": "jest --config ./test/jest-e2e.json", - "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\" \"./**/*.{yaml,yml}\"", - "format:check": "prettier --list-different \"src/**/*.ts\" \"test/**/*.ts\" \"./**/*.{yaml,yml}\"", - "generate": "hygen" + "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"", + "format:check": "prettier --list-different \"src/**/*.ts\" \"test/**/*.ts\"", }, "dependencies": { "@hapi/joi": "^16.1.5", From a242d5465fabc6f6db31efb0cc97e6695fc6b0e1 Mon Sep 17 00:00:00 2001 From: LecomteAdrien Date: Mon, 2 Nov 2020 11:11:41 +0100 Subject: [PATCH 11/16] Update config.yml --- .circleci/config.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 98dd332..5b14c79 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,11 +1,7 @@ workflows: version: 2.1 - build_and_test: jobs: - install - - yarn: - requires: - - install - test: requires: - install From 33aabb7e88f739de8ec7903f7a4d1d3ba860e601 Mon Sep 17 00:00:00 2001 From: LecomteAdrien Date: Mon, 2 Nov 2020 11:13:19 +0100 Subject: [PATCH 12/16] Update config.yml --- .circleci/config.yml | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5b14c79..d64e798 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,34 +1,34 @@ -workflows: version: 2.1 +workflows: + build_and_test: jobs: - - install - - test: + - build + - tests: requires: - - install - + - build jobs: - build: install + build: docker: - - image: cimg/node:14.10.1 # the primary container, where your job's commands are run - + - image: cimg/node:14.10.1 steps: - - checkout + - checkout - restore_cache: - key: yarn-packages-{{ checksum "yarn.lock" }} + key: yarn-packages-v2{{ checksum "yarn.lock" }} - run: yarn global add node-gyp && yarn install - - save_cache: - key: yarn-packages-{{ checksum "yarn.lock" }} + key: yarn-packages-v2{{ checksum "yarn.lock" }} paths: - - ~/.cache/yarn - test: - steps: + - ./node_modules + tests: + docker: + - image: cimg/node:14.10.1 + steps: - checkout - - restore_cache: - key: yarn-packages-{{ checksum "yarn.lock" }} - - run: yarn lint && yarn format:check - - run: yarn test:ci - - save_cache: - key: yarn-packages-{{ checksum "yarn.lock" }} + - restore_cache: + key: yarn-packages-v2{{ checksum "yarn.lock" }} + - run: yarn lint && yarn format:check + - run: yarn test:ci + - save_cache: + key: yarn-packages-v2{{ checksum "yarn.lock" }} paths: - ./node_modules \ No newline at end of file From d6042df866161bcf5e8aad158b8b286f42cfa319 Mon Sep 17 00:00:00 2001 From: LecomteAdrien Date: Mon, 2 Nov 2020 11:15:20 +0100 Subject: [PATCH 13/16] Update config.yml --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d64e798..c5d1f81 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,7 +18,7 @@ jobs: - save_cache: key: yarn-packages-v2{{ checksum "yarn.lock" }} paths: - - ./node_modules + - ~/.cache/yarn tests: docker: - image: cimg/node:14.10.1 @@ -31,4 +31,4 @@ jobs: - save_cache: key: yarn-packages-v2{{ checksum "yarn.lock" }} paths: - - ./node_modules \ No newline at end of file + - ~/.cache/yarn \ No newline at end of file From 199b32129910930002e9fe34beabfd6c91f4baa2 Mon Sep 17 00:00:00 2001 From: LecomteAdrien Date: Mon, 2 Nov 2020 11:16:45 +0100 Subject: [PATCH 14/16] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3f9033c..87bf91b 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "test:cov": "jest --coverage", "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand", "test:e2e": "jest --config ./test/jest-e2e.json", - "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"", + "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"", "format:check": "prettier --list-different \"src/**/*.ts\" \"test/**/*.ts\"", }, "dependencies": { From a85c154c8d1690d0eefc616905a4009bd160885f Mon Sep 17 00:00:00 2001 From: LecomteAdrien Date: Mon, 2 Nov 2020 11:18:06 +0100 Subject: [PATCH 15/16] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 87bf91b..09baa8a 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand", "test:e2e": "jest --config ./test/jest-e2e.json", "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"", - "format:check": "prettier --list-different \"src/**/*.ts\" \"test/**/*.ts\"", + "format:check": "prettier --list-different \"src/**/*.ts\" \"test/**/*.ts\"" }, "dependencies": { "@hapi/joi": "^16.1.5", From 3eb633e5e0a3dd767427bf3d8ee32724fa0d5043 Mon Sep 17 00:00:00 2001 From: LecomteAdrien Date: Mon, 2 Nov 2020 11:29:43 +0100 Subject: [PATCH 16/16] Update config.yml --- .circleci/config.yml | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c5d1f81..d0d8f75 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,8 +1,12 @@ + version: 2.1 workflows: build_and_test: jobs: - build + - lint: + requires: + - build - tests: requires: - build @@ -13,22 +17,33 @@ jobs: steps: - checkout - restore_cache: - key: yarn-packages-v2{{ checksum "yarn.lock" }} + key: yarn-packages-v3{{ checksum "yarn.lock" }} - run: yarn global add node-gyp && yarn install - save_cache: - key: yarn-packages-v2{{ checksum "yarn.lock" }} + key: yarn-packages-v3{{ checksum "yarn.lock" }} paths: - - ~/.cache/yarn + - ./node_modules tests: docker: - image: cimg/node:14.10.1 steps: - checkout - restore_cache: - key: yarn-packages-v2{{ checksum "yarn.lock" }} - - run: yarn lint && yarn format:check + key: yarn-packages-v3{{ checksum "yarn.lock" }} - run: yarn test:ci - save_cache: - key: yarn-packages-v2{{ checksum "yarn.lock" }} + key: yarn-packages-v3{{ checksum "yarn.lock" }} + paths: + - ./node_modules + lint: + docker: + - image: cimg/node:14.10.1 + steps: + - checkout + - restore_cache: + key: yarn-packages-v3{{ checksum "yarn.lock" }} + - run: yarn lint && yarn format:check + - save_cache: + key: yarn-packages-v3{{ checksum "yarn.lock" }} paths: - - ~/.cache/yarn \ No newline at end of file + - ./node_modules \ No newline at end of file