From c5bbc142f66d31b9bb93b5468f8baf80e7bd2a32 Mon Sep 17 00:00:00 2001
From: Joy A <itsjoy@gmail.com>
Date: Thu, 16 Nov 2023 17:01:06 +0530
Subject: [PATCH] avniproject/avni-product#1433 | STAGING_deploy deploys to new
 staging server

---
 .circleci/config.yml | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index db29322..1dd3230 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -177,14 +177,14 @@ jobs:
               docker buildx build --platform linux/amd64,linux/arm64 --tag "$DOCKER_USERNAME/rules-server:${SHORT_CIRCLE_SHA}" --push -f Dockerfile .
             fi
 
+#  STAGING_deploy:
+#    docker:
+#      - image: cimg/node:10.24.1
+#    working_directory: ~/
+#    steps:
+#      - deploy:
+#          hostname: "ssh.staging.openchs.org"
   STAGING_deploy:
-    docker:
-      - image: cimg/node:10.24.1
-    working_directory: ~/
-    steps:
-      - deploy:
-          hostname: "ssh.staging.openchs.org"
-  NEW_STAGING_deploy:
     docker:
       - image: cimg/deploy:2023.09-node
     working_directory: ~/
@@ -237,6 +237,10 @@ workflows:
               only: /.*/
             branches:
               only: master
+      - STAGING_approve:
+          type: approval
+          requires:
+            - app_build
       - STAGING_deploy:
           context: non-prod-deploy
           filters:
@@ -245,15 +249,15 @@ workflows:
                 - master
                 - /^3\..*/
           requires:
-            - app_build
-      - NEW_STAGING_approve:
-          type: approval
-          requires:
-            - app_build
-      - NEW_STAGING_deploy:
-          context: non-prod-deploy
-          requires:
-            - NEW_STAGING_approve
+            - STAGING_approve
+#      - NEW_STAGING_approve:
+#          type: approval
+#          requires:
+#            - app_build
+#      - NEW_STAGING_deploy:
+#          context: non-prod-deploy
+#          requires:
+#            - NEW_STAGING_approve
       - PRODUCTION_approve:
           type: approval
           requires: