From 768517f43ed63f2e38116d31694e733abd1e27f7 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Thu, 30 Apr 2020 11:52:18 +0530 Subject: [PATCH 1/4] ci: added configuration for staging env --- .circleci/config.yml | 37 ++++++++++++++++++++++++++++++++++++- deploy.sh | 2 ++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c49a288539..2b9077827e 100644 --- a/.circleci/config.yml +++ b/.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 @@ -191,6 +219,13 @@ workflows: only: - develop - notifications-analytics + # This is beta env for production soft 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 diff --git a/deploy.sh b/deploy.sh index 562bdc812e..4afa6d464a 100755 --- a/deploy.sh +++ b/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 From db48bbe6ef11f469a292bb352d3ad455415139bb Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Thu, 30 Apr 2020 13:02:43 +0530 Subject: [PATCH 2/4] ci: added configuration for staging env --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2b9077827e..061d4a6ab3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -221,11 +221,11 @@ workflows: - notifications-analytics # This is beta env for production soft releases - "build-prod-staging": - context : org-global - filters: - branches: - only: - - staging-env-setup + 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 From 21763bd25390ab24f6a7cd4fbb2959a13ab9c32a Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Sat, 9 May 2020 17:13:10 -0300 Subject: [PATCH 3/4] topcoder-react-lib fix Prod using develop config --- .circleci/config.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 23019f1e68..84a81bcfab 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -188,8 +188,8 @@ workflows: filters: branches: only: - - hot-fix-hall-of-fame - develop + - config-hotfix # Production builds are exectuted # when PR is merged to the master # Don't change anything in this configuration diff --git a/package.json b/package.json index dfc7e769a1..a40b51fbfe 100644 --- a/package.json +++ b/package.json @@ -133,7 +133,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.0", + "topcoder-react-lib": "v1000.15.4", "topcoder-react-ui-kit": "^1.0.11", "topcoder-react-utils": "0.7.8", "turndown": "^4.0.2", From d56f801a9ff5341b5499fb53637c52951b28cff4 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Wed, 13 May 2020 13:13:24 +0530 Subject: [PATCH 4/4] ci : npm bump up for topcoder-react-lib to 0.17.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0b076fdae6..66d90fd976 100644 --- a/package.json +++ b/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": "v1000.16.0", + "topcoder-react-lib": "0.17.2", "topcoder-react-ui-kit": "^1.0.11", "topcoder-react-utils": "0.7.8", "turndown": "^4.0.2",