From 0b262ede55d33e10352683afa092049265108a88 Mon Sep 17 00:00:00 2001
From: spokequenouille <spokequenouille@gmail.com>
Date: Thu, 5 Nov 2020 20:06:25 +0100
Subject: [PATCH] workflow

---
 .circleci/config.yml | 91 +++++++++++++++-----------------------------
 test.yml             | 34 +++++++++++++++++
 2 files changed, 65 insertions(+), 60 deletions(-)
 create mode 100644 test.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a90e546..756a6a1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,62 +1,33 @@
-workflows:
-  install:
-    jobs:
-      - yarn
-      - lint:
-          requires:
-            - yarn
-  tests:
-    jobs:
-      - bdd
+
+version: 2.1
+
 jobs:
-  yarn:
-    docker:
-      - image: 'circleci/node:12'
-    steps:
-      - checkout
-      - restore_cache:
-          key: yarn-packages-{{ checksum "yarn.lock" }}
-      - run: yarn global add node-gyp
-      - run: yarn install
-      - save_cache:
-          key: yarn-packages-{{ checksum "yarn.lock" }}
-          paths:
-            - ./node_modules
-  lint:
-    docker:
-      - image: 'circleci/node:12'
-    steps:
-      - checkout
-      - restore_cache:
-          key: yarn-packages-{{ checksum "yarn.lock" }}
-      - run: yarn lint
-      - run: yarn format:check
-      - run: yarn test:ci
-      - save_cache:
-          key: yarn-packages-{{ checksum "yarn.lock" }}
-          paths:
-            - ./node_modules
-  bdd:
-    docker:
-      - image: 'circleci/node:12'
-        environment:
-          DATABASE_URL: postgres://psqluser:psqlpassword@localhost:5432/psdb
-          JWT_SECRET: bla bla
-          API_PORT: 3000
-          API_HOST: localhost
-          API_PROTOCOL: http
-      - image: 'circleci/postgres:9.6.2-alpine'
-        environment:
-          POSTGRES_USER: psqluser
-          POSTGRES_PASSWORD: psqlpassword
-          POSTGRES_DB: psdb
+    deploy_node:
+        docker:
+            - image: cimg/node:14.10.1 # the primary container, where your job's commands are run
+                environment:
+                    DATABASEURL: postgres://psqluser:psqlpassword@localhost:5432/psdb
+                    JWT_SECRET: secret
+                    API_PORT: 3000
+                    API_HOST: localhost
+                    API_PROTOCOL: http
+                auth:
+                    username: mydockerhub-user
+                    password: $DOCKERHUB_PASSWORD # context / project UI env-var reference
+        steps: 
+            - checkout
+            - restore_cache:
+                key: yarn-packages-{{checksum "yarn.lock"}}
+            - run:
+                name: install node
+                command: yarn global add node-gyp && yarn install
+            - save_cache:
+                key: yarn-packages-{{checksum "yarn.lock"}}
+                paths:
+                    - ./node_module
 
-    steps:
-      - checkout
-      - restore_cache:
-          key: yarn-packages-{{ checksum "yarn.lock" }}
-      - run: yarn test:e2e
-      - save_cache:
-          key: yarn-packages-{{ checksum "yarn.lock" }}
-          paths:
-            - ./node_modules
\ No newline at end of file
+
+workflows:
+    build_docker:
+        jobs:
+            - deploy_node
diff --git a/test.yml b/test.yml
new file mode 100644
index 0000000..03072c6
--- /dev/null
+++ b/test.yml
@@ -0,0 +1,34 @@
+version: 2.1
+
+jobs:
+  build:
+    docker:
+      - image: cimg/node:14.10.1 # the primary container, where your job's commands are run
+        environment:
+          DATABASEURL: postgres://psqluser:psqlpassword@localhost:5432/psdb
+          JWT_SECRET: secret
+          API_PORT: 3000
+          API_HOST: localhost
+          API_PROTOCOL: http
+        auth:
+          username: mydockerhub-user
+          password: $DOCKERHUB_PASSWORD # context / project UI env-var reference
+      - image: 'circleci/postgres:9.6.2-alpine'
+        environment:
+          POSTGRE_USER: psqluser
+          POSTGRE_PASSWORD: psqlpassword
+          POSTGRE_DB: psdb
+    steps:
+      - checkout # check out the code in the project directory
+      - restore_cache:
+          key: yarn-packages-{{checksum "yarn.lock"}}
+      - run:
+          name: install node
+          command: yarn global add node-gyp && yarn install
+      - run: yarn lint
+      - run: yarn format --check
+      - run: yarn test:ci
+      - save_cache:
+          key: yarn-packages-{{checksum "yarn.lock"}}
+          paths:
+            - ./node_module
\ No newline at end of file