Merge pull request #4362 from topcoder-platform/develop

Bug-fixes : Marathon Leaderboard and build config fix

Author: sushilshinde

.circleci/config.yml

@@ -119,7 +119,35 @@ jobs:
             source awsenvconf
             source buildenvvar
             ./master_deploy.sh -d ECS -e PROD -t latest -s beta_communityapp_taskvar, -i communityapp
-            
+  
+  # Build & Deploy against prod api backend
+  "build-prod-staging":
+    <<: *defaults
+    steps:
+      # Initialization.
+      - checkout
+      - setup_remote_docker
+      - run: *install_dependency
+      - run: *install_deploysuite
+      # Restoration of node_modules from cache.
+      - restore_cache: *restore_cache_settings_for_build
+      - run: 
+          name: "configuring environment"
+          command: |
+            ./awsconfiguration.sh PROD
+            ./buildenv.sh -e PROD -b staging_communityapp_buildvar,staging_communityapp_deployvar
+      # Build of Docker image.
+      - run: *build_docker_image
+      # Caching node modules.
+      - save_cache: *save_cache_settings
+      # Deployment.
+      - deploy:
+          name: Running MasterScript
+          command: |
+            source awsenvconf
+            source buildenvvar
+            ./master_deploy.sh -d ECS -e PROD -t latest -s staging_communityapp_taskvar, -i communityapp            
+  
   # Build & Deploy against production backend
   "build-prod":
     <<: *defaults
@@ -189,6 +217,13 @@ workflows:
             branches:
               only:
                 - develop
+      # This is stage env for production QA releases
+      - "build-prod-staging":
+          context : org-global
+          filters:
+            branches:
+              only:
+                - staging-env-setup
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration

deploy.sh

@@ -85,6 +85,8 @@ make_task_def(){
 			NODE_CONFIG_ENV=production
 	elif [ "$ENV" = "PRODBETA" ]; then
 			NODE_CONFIG_ENV=production
+	elif [ "$ENV" = "PRODSTAGING" ]; then
+			NODE_CONFIG_ENV=production
 	elif [ "$ENV" = "DEV" ]; then
 			NODE_CONFIG_ENV=development
 	elif [ "$ENV" = "TEST" ]; then

package.json

@@ -134,7 +134,7 @@
     "tc-accounts": "git+https://github.com/appirio-tech/accounts-app.git#dev",
     "tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3",
     "tc-ui": "^1.0.12",
-    "topcoder-react-lib": "v0.17.1",
+    "topcoder-react-lib": "0.17.2",    
     "topcoder-react-ui-kit": "^1.0.11",
     "topcoder-react-utils": "0.7.8",
     "turndown": "^4.0.2",