Skip to content

Bug-fixes : Marathon Leaderboard and build config fix #4362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
May 13, 2020
Merged

Bug-fixes : Marathon Leaderboard and build config fix #4362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
768517f
ci: added configuration for staging env
sushilshinde Apr 30, 2020
db48bbe
ci: added configuration for staging env
sushilshinde Apr 30, 2020
21763bd
topcoder-react-lib fix Prod using develop config
luizrrodrigues May 9, 2020
f7f2576
ci: Merge remote-tracking branch 'origin/develop' into config-hotfix
sushilshinde May 12, 2020
829cf8a
Merge pull request #4358 from topcoder-platform/config-hotfix
sushilshinde May 12, 2020
64453a7
Merge branch 'develop' into staging-env-setup
sushilshinde May 12, 2020
804e8a1
Merge pull request #4359 from topcoder-platform/staging-env-setup
sushilshinde May 12, 2020
d56f801
ci : npm bump up for topcoder-react-lib to 0.17.2
sushilshinde May 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 36 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down