summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2017-04-28 14:43:56 +0300
committerGitHub <noreply@github.com>2017-04-28 14:43:56 +0300
commit96ddb9bfb25af23cd9f1e9e32ab5306865501fe8 (patch)
tree9ef60cc51f29e5348d0780108210a920841c4f16 /.travis.yml
parentc4835847c0e7bf8ef0f1fc128837b625c2650210 (diff)
parentc5a738ba0a378b695d4c1e66516d2760336a7f13 (diff)
downloadwekan-96ddb9bfb25af23cd9f1e9e32ab5306865501fe8.tar.gz
wekan-96ddb9bfb25af23cd9f1e9e32ab5306865501fe8.tar.bz2
wekan-96ddb9bfb25af23cd9f1e9e32ab5306865501fe8.zip
Merge pull request #1017 from stephenmoloney/devel-local
changes to travis.yml.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml29
1 files changed, 17 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml
index ca76cab3..1bdc5b25 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,17 @@
+dist: trusty
sudo: required
env:
- DOCKER_COMPOSE_VERSION: 1.11.2
+ TRAVIS_DOCKER_COMPOSE_VERSION: 1.12.0
+ TRAVIS_NODE_VERSION: 4.8.1
+ TRAVIS_NPM_VERSION: 4.4.4
before_install:
+ - sudo apt-get update -y
+ - npm install -g npm@${TRAVIS_NPM_VERSION}
- sudo curl -fsSL https://get.docker.com/ | sh
- if [ -e /usr/local/bin/docker-compose ]; then sudo rm /usr/local/bin/docker-compose; fi
- - sudo curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
+ - sudo curl -L https://github.com/docker/compose/releases/download/${TRAVIS_DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
- sudo chmod +x docker-compose
- sudo mv docker-compose /usr/local/bin
- sudo docker-compose build --no-cache --force-rm
@@ -15,13 +20,13 @@ before_install:
# ^^ Note - need to come up with some way of checking the output from docker run
# that it was a success... perhaps the nodejs server can output a success message?
-#language: node_js
-#
-#node_js:
-# - "4.8.1"
-#
-#install:
-# - "npm install"
-#
-#script:
-# - "npm test"
+language: node_js
+
+node_js:
+ - "${TRAVIS_NODE_VERSION}"
+
+install:
+ - "npm install"
+
+script:
+ - "npm test"