Octave Travis install workaround tweak
Workaround only needed for kwwette installs
This commit is contained in:
parent
f0f2fd2dae
commit
ddf2349881
1 changed files with 8 additions and 8 deletions
|
|
@ -63,17 +63,17 @@ case "$SWIGLANG" in
|
||||||
travis_retry sudo apt-get -qq install ocaml ocaml-findlib
|
travis_retry sudo apt-get -qq install ocaml ocaml-findlib
|
||||||
;;
|
;;
|
||||||
"octave")
|
"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
|
# Travis adds external PPAs which contain newer versions of packages
|
||||||
# than in baseline trusty. These newer packages prevent some of the
|
# than in baseline trusty. These newer packages prevent some of the
|
||||||
# Octave packages in ppa:kwwette/octave, which rely on the older
|
# Octave packages in ppa:kwwette/octave, which rely on the older
|
||||||
# packages in trusty, from installing. To prevent these kind of
|
# packages in trusty, from installing. To prevent these kind of
|
||||||
# interactions arising, clean out all external PPAs added by Travis
|
# interactions arising, clean out all external PPAs added by Travis
|
||||||
# before installing Octave
|
# before installing Octave
|
||||||
travis_retry sudo rm -rf /etc/apt/sources.list.d/*
|
sudo rm -rf /etc/apt/sources.list.d/*
|
||||||
travis_retry sudo apt-get -qq update
|
travis_retry sudo apt-get -qq update
|
||||||
if [[ -z "$VER" ]]; then
|
|
||||||
travis_retry sudo apt-get -qq install liboctave-dev
|
|
||||||
else
|
|
||||||
travis_retry sudo add-apt-repository -y ppa:kwwette/octaves
|
travis_retry sudo add-apt-repository -y ppa:kwwette/octaves
|
||||||
travis_retry sudo apt-get -qq update
|
travis_retry sudo apt-get -qq update
|
||||||
travis_retry sudo apt-get -qq install liboctave${VER}-dev
|
travis_retry sudo apt-get -qq install liboctave${VER}-dev
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue