Merge pull request #6 from styleseat/test-branch-2

Remove merge hold temporarily
styleseat · Oct 22, 2020 · c524792 · c524792
2 parents 20dc43b + aef9215
commit c524792
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -15,38 +15,42 @@ jobs:
       - image: cimg/node:14.14
     steps:
       - checkout
+      - run: sudo apt update && sudo apt install software-properties-common && sudo add-apt-repository ppa:deadsnakes/ppa
+      - run: sudo apt install python3-pip && sudo apt install python3.7 && python3.7 -m pip install pip
       - run: npm ci
-      - run: REDIS_HOST="$STAGE_REDIS_HOST" AWS_METRIC_NAMESPACE="stage" npm run deploy
+      - run: REDIS_HOST="$STAGE_REDIS_HOST" AWS_METRIC_NAMESPACE="stage" npm run deploy -- --stage stage
 
   deploy_prod:
     docker:
       - image: cimg/node:14.14
     steps:
       - checkout
+      - run: sudo apt update && sudo apt install software-properties-common && sudo add-apt-repository ppa:deadsnakes/ppa
+      - run: sudo apt install python3-pip && sudo apt install python3.7 && python3.7 -m pip install pip
       - run: npm ci
-      - run: REDIS_HOST="$PROD_REDIS_HOST" AWS_METRIC_NAMESPACE="prod" npm run deploy
+      - run: REDIS_HOST="$PROD_REDIS_HOST" AWS_METRIC_NAMESPACE="prod" npm run deploy -- --stage prod
 
 workflows:
   version: 2
   ss_instrumentation:
     jobs:
       - toxtest
-      - merge_hold:
+      - deploy_hold:
           type: approval
           filters:
             branches:
               only:
                 - master
       - deploy_stage:
           requires:
-            - merge_hold
+            - deploy_hold
           filters:
             branches:
               only:
                 - master
       - deploy_prod:
           requires:
-            - merge_hold
+            - deploy_hold
           filters:
             branches:
               only: