Attempt circleCi config update

Author: jamescrowley

.circleci/config.yml

@@ -3,12 +3,22 @@ orbs:
   gcp-cli: circleci/[email protected]
   slack: circleci/[email protected]
 jobs:
+  checkout-to-workspace:
+    docker:
+      - image: circleci/python:3.8-buster-node
+    steps:
+      - checkout
+      - persist_to_workspace:
+          root: .
+          paths:
+            - .
   build-flask:
     docker:
       - image: circleci/python:3.8-buster
     working_directory: ~/flask
     steps:
-      - checkout
+      - attach_workspace:
+          at: ~/
       # Restore cached dependencies
       - restore_cache:
           key: flask-deps-{{ checksum "requirements.txt" }}
@@ -34,11 +44,8 @@ jobs:
       - image: circleci/python:3.8-buster-node
     working_directory: ~/react
     steps:
-      - run:
-          name: Clone React Repo
-          command: |
-            cd ..
-            git clone --branch master https://github.com/boxwise/boxwise-react.git react
+      - attach_workspace:
+          at: ~/
       - run:
           name: Generate .env File
           command: |
@@ -50,7 +57,7 @@ jobs:
               REACT_APP_LOGOUT_URL=${REACT_APP_LOGOUT_URL}
               REACT_APP_GRAPHQL_SERVER=${REACT_APP_GRAPHQL_SERVER}" > .env
       - run:
-          name: Set hompage in package.json
+          name: Set homepage in package.json
           command: |
             sed -i 's|"homepage": "http://localhost:3000/"|"homepage": "https://'$URL'/mobile"|' package.json
       # following https://circleci.com/docs/2.0/yarn/
@@ -85,7 +92,7 @@ jobs:
     steps:
       # Attach workspace from build
       - attach_workspace:
-          at: .
+          at: ~/
       # - restore_cache:
       #     key: flask-dev-deps-{{ checksum "requirements-dev.txt" }}
       - run:
@@ -122,7 +129,7 @@ jobs:
     steps:
       # Attach workspace from build
       - attach_workspace:
-          at: .
+          at: ~/
       # install gcloud orb
       - gcp-cli/install
       - run:
@@ -159,74 +166,19 @@ jobs:
       - slack/notify-on-failure:
         only_for_branches: master,production
 
-
 workflows:
   build-and-deploy:
     jobs:
-    - build-flask
-
-    - test-flask:
-        requires:
-          - build-flask
-
-    - build-react:
-        name: build-react-for-staging
-        context: STAGING
-        filters:
-          branches:
-            only: master
-
-    # deploy to staging
-    - deploy:
-        name: deploy-staging
-        context: STAGING
-        serviceName: api-staging
-        requires:
-          - test-flask
-          - build-react-for-staging
-        filters:
-          branches:
-            only: master
-
-    # deploy to demo
-    - deploy:
-        name: deploy-demo
-        context: DEMO
-        serviceName: api-demo
-        filters:
-          branches:
-            only: production
-
-    # deploy to production
-    - deploy:
-        name: deploy-production
-        context: PRODUCTION
-        serviceName: api-production
-        filters:
-          branches:
-            only: production
-  # nightly workflow to deploy master from React each night
-  nightly:
-    triggers:
-      - schedule:
-          cron: "0 5 * * *"
-          filters:
-            branches:
-              only:
-                - master
-    jobs:
-      - build-flask
-
+      - checkout-to-workspace
+      - build-flask:
+          requires:
+            - checkout-to-workspace
       - test-flask:
           requires:
             - build-flask
-
       - build-react:
-          name: build-react-for-staging
-          context: STAGING
-          filters:
-            branches:
-              only: master
+          requires:
+            - checkout-to-workspace
 
       # deploy to staging
       - deploy:
@@ -235,7 +187,25 @@ workflows:
           serviceName: api-staging
           requires:
             - test-flask
-            - build-react-for-staging
+            - build-react
           filters:
             branches:
               only: master
+
+      # deploy to demo
+      - deploy:
+          name: deploy-demo
+          context: DEMO
+          serviceName: api-demo
+          filters:
+            branches:
+              only: production
+
+      # deploy to production
+      - deploy:
+          name: deploy-production
+          context: PRODUCTION
+          serviceName: api-production
+          filters:
+            branches:
+              only: production

flask/setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name="boxwise-flask",
-    use_scm_version=True,
+    use_scm_version={"root": ".."},
     description="""Boxwise is a web application that makes it easy for
     organisations to source, store and distribute donated goods to people in
     need in a fair and dignified way.""",
@@ -16,4 +16,4 @@
     packages=find_packages(exclude=["test"]),
     setup_requires=["setuptools_scm"],
     install_requires=REQUIREMENTS,
-)
+)