Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

badge updates and CI update #1232

Merged
merged 9 commits into from
Oct 3, 2017
Merged

badge updates and CI update #1232

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bf7d199
F2F: Topcoder - Dashboard header update
birdofpreyru Sep 13, 2017
2553cad
only package update changes
sushilshinde Sep 18, 2017
a579807
Merge branch 'dev' into f2f-dashboard-ronakkaria-3
sushilshinde Sep 20, 2017
87a7073
Switch to CircleCI
mtwomey Sep 25, 2017
6cd066e
Merge branch 'feature/circleCi' into dev
mtwomey Sep 25, 2017
67ac9b8
Added code to display SRM badge on dashboard
sushilshinde Sep 26, 2017
7db87d5
Merge pull request #1231 from appirio-tech/issue-450
ajefts Sep 27, 2017
d4d3d9c
Minor tweaks to circleCI deploy
mtwomey Sep 28, 2017
7513cfd
Merge branch 'feature/circleCi' into dev
mtwomey Sep 28, 2017
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
1 change: 0 additions & 1 deletion deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ configure_aws_cli() {
}

deploy_s3bucket() {
cat dist/app.2e9868372e0e2992d5d2.css
aws s3 sync --dryrun ${HOME}/${CIRCLE_PROJECT_REPONAME}/dist s3://${AWS_S3_BUCKET} --cache-control max-age=0,s-maxage=86400 --exclude "*.txt" --exclude "*.js" --exclude "*.css"
result=`aws s3 sync ${HOME}/${CIRCLE_PROJECT_REPONAME}/dist s3://${AWS_S3_BUCKET} --cache-control max-age=0,s-maxage=86400 --exclude "*.txt" --exclude "*.js" --exclude "*.css"`
if [ $? -eq 0 ]; then
Expand Down
2 changes: 1 addition & 1 deletion webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require('./node_modules/coffee-script/register')

const CI = process.env.TRAVIS_BRANCH
const CI = process.env.CIRCLE_BRANCH

if (CI === 'master') {
process.env.ENV = 'PROD'
Expand Down