From 2021b7db78e1d33564c611158bfa0ae19a9c4223 Mon Sep 17 00:00:00 2001 From: PrakashDurlabhji Date: Tue, 14 Apr 2020 20:09:31 +0530 Subject: [PATCH 1/5] Update index.jsx --- src/shared/routes/Settings/index.jsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/shared/routes/Settings/index.jsx b/src/shared/routes/Settings/index.jsx index f352d2d37d..8f6023fceb 100644 --- a/src/shared/routes/Settings/index.jsx +++ b/src/shared/routes/Settings/index.jsx @@ -16,10 +16,10 @@ export default function Settings({ base }) { .then(({ default: Router }) => ) } renderPlaceholder={() => } - renderServer={() => { - const Router = webpack.requireWeak(path.resolve(__dirname, './Router')); - return ; - }} + // renderServer={() => { + // const Router = webpack.requireWeak(path.resolve(__dirname, './Router')); + // return ; + //}} /> ); } From 7ebec7e7e7dad8173e6e7391f1d6da8bc5dd10f7 Mon Sep 17 00:00:00 2001 From: prakashdurlabhji Date: Tue, 14 Apr 2020 21:01:48 +0530 Subject: [PATCH 2/5] lint fix --- src/shared/routes/Settings/index.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/shared/routes/Settings/index.jsx b/src/shared/routes/Settings/index.jsx index 8f6023fceb..96f929857c 100644 --- a/src/shared/routes/Settings/index.jsx +++ b/src/shared/routes/Settings/index.jsx @@ -4,8 +4,8 @@ import React from 'react'; import PT from 'prop-types'; -import path from 'path'; -import { AppChunk, webpack } from 'topcoder-react-utils'; +// import path from 'path'; +import { AppChunk } from 'topcoder-react-utils'; import LoadingIndicator from 'components/LoadingIndicator'; export default function Settings({ base }) { @@ -19,7 +19,7 @@ export default function Settings({ base }) { // renderServer={() => { // const Router = webpack.requireWeak(path.resolve(__dirname, './Router')); // return ; - //}} + // }} /> ); } From 356edad5a90eee06d40d363e109cd7cf55f2556a Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Tue, 14 Apr 2020 21:25:26 +0530 Subject: [PATCH 3/5] ci : deploying on beta --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7c7744b679..922666b4c8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -189,6 +189,7 @@ workflows: branches: only: - develop + - hot-fix-profile-issue # Production builds are exectuted only on tagged commits to the # master branch. - "build-prod": From 42532f515fc542341132958320dc26be57ad9aaa Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Wed, 15 Apr 2020 09:35:51 +0530 Subject: [PATCH 4/5] ci:deployong on beta and test env for QA --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 922666b4c8..79f443703b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -181,7 +181,7 @@ workflows: filters: branches: only: - - comcast-community + - hot-fix-profile-issue # This is beta env for production soft releases - "build-prod-beta": context : org-global From ec98ae36f36a349ecb80ae783b870a781da05ac9 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Wed, 15 Apr 2020 10:45:42 +0530 Subject: [PATCH 5/5] ci: deploying on dev and beta --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 79f443703b..7358b14ab8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -175,13 +175,14 @@ workflows: branches: only: - develop + - hot-fix-profile-issue # This is alternate dev env for parallel testing - "build-test": context : org-global filters: branches: only: - - hot-fix-profile-issue + - develop # This is beta env for production soft releases - "build-prod-beta": context : org-global