Skip to content

Commit

Permalink
ci: ci file housekeeping
Browse files Browse the repository at this point in the history
  • Loading branch information
addaleax committed Mar 19, 2017
1 parent 6e887ca commit 48e48ea
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ env:
- TRAVIS_NODE_VERSION="4"
- TRAVIS_NODE_VERSION="5"
- TRAVIS_NODE_VERSION="6"
- TRAVIS_NODE_VERSION="6" NWJS_VERSION="0.12.3"
- TRAVIS_NODE_VERSION="7"
- TRAVIS_NODE_VERSION="7" NWJS_VERSION="0.21.3"
os:
- linux
- osx
Expand All @@ -35,11 +36,11 @@ before_install:
# coveralls
- pip install --user cpp-coveralls coveralls-merge
# compilers
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; AR="gcc-ar-4.8"; RANLIB="gcc-ranlib-4.8"; NM="gcc-nm-4.8" LTO_FLAG="-flto"; fi
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8" AR="gcc-ar-4.8" RANLIB="gcc-ranlib-4.8" NM="gcc-nm-4.8" LTO_FLAG="-flto"; fi
- if [ "$CXX" = "clang++" ]; then export NPMOPT=--clang=1 LTO_FLAG=""; fi
# node versions
- rm -rf ~/.nvm
- git clone --branch v0.30.2 https://github.com/creationix/nvm.git ~/.nvm
- git clone --branch v0.33.1 https://github.com/creationix/nvm.git ~/.nvm
- source ~/.nvm/nvm.sh
- nvm install "$TRAVIS_NODE_VERSION"
- if [ -n "$NWJS_VERSION" ]; then export DISPLAY=:99.0 ; sh -e /etc/init.d/xvfb start || true ; sleep 3 ; fi
Expand Down
4 changes: 4 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ environment:
platform: x64
- nodejs_version: "6"
platform: x86
- nodejs_version: "7"
platform: x64
- nodejs_version: "7"
platform: x86
- nodejs_version: "5"
platform: x64
- nodejs_version: "5"
Expand Down

0 comments on commit 48e48ea

Please sign in to comment.