From be50bb483c712a62344d6a93b1250c04b275bc50 Mon Sep 17 00:00:00 2001
From: Straw-Etiam <etiam.ayedze@gmail.com>
Date: Sat, 16 Jan 2021 12:49:23 +0100
Subject: [PATCH] :construction_worker: update CI

---
 .circleci/config.yml | 46 ++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index daf632e..6801079 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -16,27 +16,22 @@ jobs:
             python3 -m venv venv
             . venv/bin/activate
             pip install -r requirements/dev.txt
+          environment:
+            CONDUIT_SECRET: 'something-really-secret'
+            FLASK_APP: /home/circleci/repo/autoapp.py
+            FLASK_DEBUG: 1
+  
       - save_cache:
           keys:
             - v3-dependencies-{{ checksum "requirements/dev.txt" }}-{{ checksum "requirements/prod.txt" }}
-            - v3-dependencies-
-
           paths:
-            - "venv"
+            - venv
 
 
   test:
     docker:
       - image: circleci/python:latest
-        environment:
-          CONDUIT_SECRET: 'something-really-secret'
-          FLASK_APP: /home/circleci/repo/autoapp.py
-          DATABASE_URL: postgresql://myUser:somePwd@localhost:5432/mydb
-          FLASK_DEBUG: 1
-          POSTGRES_USER: myUser
-          POSTGRES_DB: mydb
-          POSTGRES_PASSWORD: somePwd
-          POSTGRES_PORT: 5432
+       
       - image: circleci/postgres:9.6.9-alpine
         environment:
           POSTGRES_USER: myUser
@@ -54,6 +49,11 @@ jobs:
           command: dockerize -wait tcp://localhost:5432 -timeout 1m
       
       - run:
+          name: flask upgrade
+          command: |
+            . venv/bin/activate
+            sleep 1
+            flask db upgrade
         environment:
           CONDUIT_SECRET: 'something-really-secret'
           FLASK_APP: /home/circleci/repo/autoapp.py
@@ -63,13 +63,15 @@ jobs:
           POSTGRES_DB: mydb
           POSTGRES_PASSWORD: somePwd
           POSTGRES_PORT: 5432
-
-          name: flask upgrade
+          
+            
+      - run:
+          name: flask test
           command: |
             . venv/bin/activate
             sleep 1
-            flask db upgrade
-      - run:
+            flask db migrate
+            flask test
         environment:
           CONDUIT_SECRET: 'something-really-secret'
           FLASK_APP: /home/circleci/repo/autoapp.py
@@ -79,11 +81,13 @@ jobs:
           POSTGRES_DB: mydb
           POSTGRES_PASSWORD: somePwd
           POSTGRES_PORT: 5432
-          name: flask test
-          command: |
-            . venv/bin/activate
-            sleep 1
-            flask test
+          
+      - save_cache:
+          keys:
+            - v3-dependencies-{{ checksum "requirements/dev.txt" }}-{{ checksum "requirements/prod.txt" }}
+          paths:
+            - venv
+          
             
             
   deploy: