From 4a3bc5ee2911a61aa8c06224c6878444d0110efa Mon Sep 17 00:00:00 2001 From: rashmi73 <41687423+rashmi73@users.noreply.github.com> Date: Thu, 2 Apr 2020 20:35:35 +0530 Subject: [PATCH 1/5] Update index.jsx --- .../components/challenge-listing/ChallengeCard/Status/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/components/challenge-listing/ChallengeCard/Status/index.jsx b/src/shared/components/challenge-listing/ChallengeCard/Status/index.jsx index aaf82505b3..72a6227d7e 100644 --- a/src/shared/components/challenge-listing/ChallengeCard/Status/index.jsx +++ b/src/shared/components/challenge-listing/ChallengeCard/Status/index.jsx @@ -216,7 +216,7 @@ export default function ChallengeStatus(props) { .filter(p => p.phaseType !== 'Registration') .sort((a, b) => moment(a.scheduledEndTime).diff(b.scheduledEndTime))[0]; - if (!statusPhase && subTrack === 'FIRST_2_FINISH' && checkPhases.length) { + if (!statusPhase && (subTrack === 'FIRST_2_FINISH' || subTrack === 'CODE') && checkPhases.length) { statusPhase = _.clone(checkPhases[0]); statusPhase.phaseType = 'Submission'; } From a9a4e8d84432ec94eef6895a347d1f24a461c7d0 Mon Sep 17 00:00:00 2001 From: LieutenantRoger Date: Fri, 3 Apr 2020 00:08:45 +0800 Subject: [PATCH 2/5] ci: deploying to dev --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6875709bd3..9cbe8ce773 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -174,7 +174,7 @@ workflows: filters: branches: only: - - develop + - listing-fix # This is alternate dev env for parallel testing - "build-test": context : org-global From 4d54f6b0eebdd8d21cb6b61fc31790092cdad19a Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Fri, 3 Apr 2020 08:52:31 +0530 Subject: [PATCH 3/5] ci: deploying on beta for QA --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9cbe8ce773..81b389c57f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -174,14 +174,14 @@ workflows: filters: branches: only: - - listing-fix + - develop # This is alternate dev env for parallel testing - "build-test": context : org-global filters: branches: only: - - feature-contentful + - listing-fix # This is beta env for production soft releases - "build-prod-beta": context : org-global From ab5258dc9fa16306c450ad412315e1744f59c144 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Fri, 3 Apr 2020 09:24:24 +0530 Subject: [PATCH 4/5] ci: deploying on beta for test --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 81b389c57f..dfee246dac 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -181,14 +181,14 @@ workflows: filters: branches: only: - - listing-fix + - develop # This is beta env for production soft releases - "build-prod-beta": context : org-global filters: branches: only: - - develop + - listing-fix # Production builds are exectuted only on tagged commits to the # master branch. - "build-prod": From f56256d82ab96cddfbeec4d5637b2b741f5fdfdc Mon Sep 17 00:00:00 2001 From: LieutenantRoger Date: Mon, 6 Apr 2020 19:52:20 +0800 Subject: [PATCH 5/5] ci: test --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4655bf0b17..28a681e0da 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -174,6 +174,7 @@ workflows: filters: branches: only: + - develop - feature-devices-lookup # This is alternate dev env for parallel testing - "build-test":