Merge branch 'feature/circleCi' into dev

mtwomey · mtwomey · commit 7513cfdbbba0 · 2017-09-28T16:43:24.000-05:00
diff --git a/deploy.sh b/deploy.sh
@@ -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
diff --git a/webpack.config.js b/webpack.config.js
@@ -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'

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ configure_aws_cli() {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`deploy_s3bucket() {`
`18`		`- cat dist/app.2e9868372e0e2992d5d2.css`
`19`	`18`	`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"`
`20`	`19`	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"`
`21`	`20`	`if [ $? -eq 0 ]; then`