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
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Minor tweaks to circleCI deploy
  • Loading branch information
mtwomey committed Sep 28, 2017
commit d4d3d9cdd2c0cbcf16671d70388a4a92b2900229
1 change: 0 additions & 1 deletion deploy.sh
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
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