From 85a9f5b96a814541e1fd80d34ec2e165a3fa60d4 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Thu, 13 Aug 2020 08:57:23 +0530 Subject: [PATCH 1/3] ci: deploy on QA ENV --- .circleci/config.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fa18367f07..9858592cf8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -230,8 +230,7 @@ workflows: filters: branches: only: - - develop - - feature-contentful + - hot-fix # This is alternate dev env for parallel testing - "build-test": context : org-global @@ -252,15 +251,14 @@ workflows: filters: branches: only: - - develop - - feature-contentful + - hot-fix # This is stage env for production QA releases - "build-prod-staging": context : org-global filters: branches: only: - - develop + - hot-fix # Production builds are exectuted # when PR is merged to the master # Don't change anything in this configuration From 923fead789c073b7815d174245533a6a867b94ee Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Tue, 18 Aug 2020 18:35:41 +0530 Subject: [PATCH 2/3] feat: V5 Challenge API, Resource API integration --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 9ef32087c4..e8542c7a64 100644 --- a/package.json +++ b/package.json @@ -136,8 +136,8 @@ "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": "1000.19.48", - "topcoder-react-ui-kit": "1000.0.4", + "topcoder-react-lib": "1.0.0", + "topcoder-react-ui-kit": "2.0.0", "topcoder-react-utils": "0.7.8", "turndown": "^4.0.2", "url-parse": "^1.4.1", From ee8dde183afd4482c8558a8d72e5a242b01c8cd3 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Tue, 18 Aug 2020 18:38:24 +0530 Subject: [PATCH 3/3] ci: deploy on beta --- .circleci/config.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index eec155d2cf..e2bbcef814 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -230,8 +230,7 @@ workflows: filters: branches: only: - - integration-v5-develop - - hot-fix + - develop # This is alternate dev env for parallel testing - "build-test": context : org-global @@ -245,15 +244,14 @@ workflows: filters: branches: only: - - develop + - hot-fix # This is beta env for production soft releases - "build-prod-beta": context : org-global filters: branches: only: - - integration-v5-develop - - hot-fix + - develop # This is stage env for production QA releases - "build-prod-staging": context : org-global