Skip to content

Commit

Permalink
Fix typos; try new test env
Browse files Browse the repository at this point in the history
  • Loading branch information
mizzao committed Dec 21, 2016
1 parent d6a2bdb commit 02a0a3e
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 11 deletions.
25 changes: 17 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
language: objective-c
sudo: required
language: node_js
node_js:
- "0.10"

before_install:
# Install phantomjs
- wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.0.0-macosx.zip
- unzip phantomjs-2.0.0-macosx.zip
- export PATH="`pwd`/phantomjs-2.0.0-macosx/bin:${PATH}"
# Run Arunoda's script
- "curl -L http://git.io/ejPSng | /bin/sh"
script: "make test"
- "curl -L https://git.io/ejPSng | /bin/sh"

env:
- METEOR_RELEASE=1.3.5.1

# Later stuff for Meteor 1.4
# env:
# - CXX=g++-4.8 METEOR_RELEASE=1.3.5.1
# addons:
# apt:
# sources:
# - ubuntu-toolchain-r-test
# packages:
# - g++-4.8
6 changes: 3 additions & 3 deletions server/timers_server.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ class Timers {
* @param {Function} func The function to call when a round ends. The
* function will be called with a single argument indicating the reason
* the round ended, either
* TurkServer.Timers.NEW_ROUND_TIMEOUT,
* TurkServer.Timers.NEW_ROUND_MANUAL, or
* TurkServer.Timers.NEW_ROUND_NEWROUND.
* TurkServer.Timers.ROUND_END_TIMEOUT,
* TurkServer.Timers.ROUND_END_MANUAL, or
* TurkServer.Timers.ROUND_END_NEWROUND.
*/
static onRoundEnd(func) {
_round_handlers.push(func);
Expand Down

0 comments on commit 02a0a3e

Please sign in to comment.