diff options
| author | Karl Wette <karl.wette@ligo.org> | 2019-09-18 14:43:23 +1000 |
|---|---|---|
| committer | Olly Betts <ojwbetts@gmail.com> | 2019-10-16 18:17:29 +1300 |
| commit | e4c38f0f67a74ca146986d9e8df5efd439667139 (patch) | |
| tree | a3173fcdea53d09f14ee1b9d2e43339ec025046c /Tools | |
| parent | 97a107ed256b308d690343ae633453ae18a1efb1 (diff) | |
| download | swig-e4c38f0f67a74ca146986d9e8df5efd439667139.tar.gz | |
Octave: remove use of ppa:kwwette/octaves
Diffstat (limited to 'Tools')
| -rwxr-xr-x | Tools/travis-linux-install.sh | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/Tools/travis-linux-install.sh b/Tools/travis-linux-install.sh index 37ef841dd..e902137df 100755 --- a/Tools/travis-linux-install.sh +++ b/Tools/travis-linux-install.sh @@ -71,21 +71,7 @@ case "$SWIGLANG" in travis_retry sudo apt-get -qq install ocaml camlp4 ;; "octave") - if [[ -z "$VER" ]]; then - travis_retry sudo apt-get -qq install liboctave-dev - else - # Travis adds external PPAs which contain newer versions of packages - # than in baseline trusty. These newer packages prevent some of the - # Octave packages in ppa:kwwette/octave, which rely on the older - # packages in trusty, from installing. To prevent these kind of - # interactions arising, clean out all external PPAs added by Travis - # before installing Octave - sudo rm -rf /etc/apt/sources.list.d/* - travis_retry sudo apt-get -qq update - travis_retry sudo add-apt-repository -y ppa:kwwette/octaves - travis_retry sudo apt-get -qq update - travis_retry sudo apt-get -qq install liboctave${VER}-dev - fi + travis_retry sudo apt-get -qq install liboctave-dev ;; "php") travis_retry sudo add-apt-repository -y ppa:ondrej/php |