Skip to content

Commit

Permalink
Feature/176 chimp ci optimization (winsleague#181)
Browse files Browse the repository at this point in the history
* moved chimp installation to one VM only because it's not needed for the other

* remove debug on deploy because it prints out keys

* chmod +x
  • Loading branch information
noahsw authored Aug 8, 2016
1 parent c712a99 commit 7052afa
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
3 changes: 0 additions & 3 deletions app/.testing/cache_npm_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
echo "Pruning …"
meteor npm prune

echo "Installing Chimp …"
if [ ! -e /home/ubuntu/nvm/versions/node/v5.2.0/lib/node_modules/chimp/bin/chimp.js ]; then npm install -g [email protected]; fi

# Disabled while we use the forked Spacejam in package.json (needed to instrument coverage)
# echo "Installing Spacejam …"
# if [ ! -e /home/ubuntu/nvm/versions/node/v5.2.0/lib/node_modules/spacejam/bin/spacejam ]; then npm install -g spacejam; fi
Expand Down
2 changes: 2 additions & 0 deletions app/.testing/install_chimp.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
echo "Installing Chimp …"
if [ ! -e /home/ubuntu/nvm/versions/node/v5.2.0/lib/node_modules/chimp/bin/chimp.js ]; then npm install -g [email protected]; fi
5 changes: 5 additions & 0 deletions app/.testing/unit_and_full_app_run.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
mkdir .coverage

meteor npm run test

meteor npm run test-app
4 changes: 2 additions & 2 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ checkout:

test:
override:
- case $CIRCLE_NODE_INDEX in 0) (cd app; mkdir .coverage; meteor npm run test; meteor npm run test-app) ;; 1) (cd app; ./tests/acceptance_run) ;; esac:
- case $CIRCLE_NODE_INDEX in 0) (cd app; ./.testing/unit_and_full_app_run.sh) ;; 1) (cd app; ./.testing/install_chimp.sh; ./tests/acceptance_run) ;; esac:
parallel: true

deployment:
Expand All @@ -51,7 +51,7 @@ deployment:

# Deploy
- npm install -g [email protected] # install meteor-up for deployment
- (cd .deploy/production; DEBUG=* mup deploy)
- (cd .deploy/production; mup deploy)

# Notify Rollbar about deploy
- curl https://api.rollbar.com/api/1/deploy/ -F access_token=$ROLLBAR_SERVER_ACCESS_TOKEN -F environment=production -F revision=$CIRCLE_SHA1 -F local_username=$CIRCLE_USERNAME

0 comments on commit 7052afa

Please sign in to comment.