Skip to content
This repository has been archived by the owner on Jun 16, 2018. It is now read-only.

Commit

Permalink
Merge branch 'master' into periodic_scores_refresh
Browse files Browse the repository at this point in the history
Conflicts:
	spec/mocks/scoresMock.js
	src/js/views/scores.js
  • Loading branch information
poelstra committed Oct 23, 2017
2 parents 341efe0 + f7f3b46 commit 97e09a7
Show file tree
Hide file tree
Showing 29 changed files with 7,979 additions and 3,757 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
@@ -1,11 +1,11 @@
language: node_js
node_js:
- 0.10
- 8.4
before_install:
- "npm i -g bower karma-cli"
before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
after_script:
- ls ./coverage
- 'npm install coveralls@2.10.0 && cat "./coverage/Firefox 31.0.0 (Linux)/lcov.info" | coveralls'
- 'npm install coveralls@2.10.0 && cat ./coverage/*/lcov.info | coveralls'
22 changes: 22 additions & 0 deletions appveyor.yml
@@ -0,0 +1,22 @@
environment:
nodejs_version: "8.4"

# Install scripts. (runs after repo cloning)
install:
# Get the latest stable version of Node.js or io.js
- ps: Install-Product node $env:nodejs_version
# Upgrade npm
- npm install -g npm
# install modules
- npm install

# Post-install test scripts.
test_script:
# Output useful info for debugging.
- node --version
- npm --version
# run tests
- npm test

# Don't actually build.
build: off

0 comments on commit 97e09a7

Please sign in to comment.