diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2019-04-30 19:10:31 +0100 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2019-04-30 23:44:33 +0100 |
| commit | 6606a164f0624108b8075e847c5f2c213606ed72 (patch) | |
| tree | 45cec046b24b9e11e3ac4481625b9ef00e1fe679 /Tools | |
| parent | 6a91723fcfeb413350d46908343de2eb5562e3b4 (diff) | |
| download | swig-6606a164f0624108b8075e847c5f2c213606ed72.tar.gz | |
Migrate Travis tests from trusty to xenial
Ubuntu trusty 14.04 is end of life April 2019.
Ubuntu xenial 16.04 is the main platform for Travis now.
Some languages are not working on xenial, so I've left them on trusty
for now.
Diffstat (limited to 'Tools')
| -rwxr-xr-x | Tools/travis-linux-install.sh | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/Tools/travis-linux-install.sh b/Tools/travis-linux-install.sh index bfa7bf8eb..b801e2b00 100755 --- a/Tools/travis-linux-install.sh +++ b/Tools/travis-linux-install.sh @@ -44,14 +44,15 @@ case "$SWIGLANG" in "javascript") case "$ENGINE" in "node") - if [[ -z "$VER" ]]; then - travis_retry sudo apt-get install -qq nodejs node-gyp + travis_retry wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.33.10/install.sh | bash + export NVM_DIR="$HOME/.nvm" + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" + travis_retry nvm install ${VER} + nvm use ${VER} + if [ "$VER" == "0.10" ] || [ "$VER" == "0.12" ] ; then +# travis_retry sudo apt-get install -qq nodejs node-gyp + travis_retry npm install -g node-gyp@$VER else - travis_retry wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.33.10/install.sh | bash - export NVM_DIR="$HOME/.nvm" - [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" - travis_retry nvm install ${VER} - nvm use ${VER} travis_retry npm install -g node-gyp fi ;; @@ -70,8 +71,6 @@ case "$SWIGLANG" in if [[ -z "$VER" ]]; then travis_retry sudo apt-get -qq install lua5.2 liblua5.2-dev else - travis_retry sudo add-apt-repository -y ppa:ubuntu-cloud-archive/mitaka-staging - travis_retry sudo apt-get -qq update travis_retry sudo apt-get -qq install lua${VER} liblua${VER}-dev fi ;; @@ -79,8 +78,7 @@ case "$SWIGLANG" in travis_retry sudo apt-get -qq install racket ;; "ocaml") - # configure also looks for ocamldlgen, but this isn't packaged. But it isn't used by default so this doesn't matter. - travis_retry sudo apt-get -qq install ocaml ocaml-findlib + travis_retry sudo apt-get -qq install ocaml camlp4 ;; "octave") if [[ -z "$VER" ]]; then |