jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Octave: remove use of ppa:kwwette/octaves

Browse source
This commit is contained in:
Karl Wette 2019-09-18 14:43:23 +10:00 • committed by Olly Betts
commit e4c38f0f67
2 changed files with 1 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Tools/travis-linux-install.sh
View file

@ -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