Octave: remove use of ppa:kwwette/octaves
This commit is contained in:
parent
97a107ed25
commit
e4c38f0f67
2 changed files with 1 additions and 20 deletions
|
|
@ -322,11 +322,6 @@ matrix:
|
||||||
env: SWIGLANG=java CPP11=1
|
env: SWIGLANG=java CPP11=1
|
||||||
sudo: required
|
sudo: required
|
||||||
dist: xenial
|
dist: xenial
|
||||||
- compiler: gcc
|
|
||||||
os: linux
|
|
||||||
env: SWIGLANG=octave SWIGJOBS=-j2 VER=4.4 CPP11=1
|
|
||||||
sudo: required
|
|
||||||
dist: trusty
|
|
||||||
- os: linux
|
- os: linux
|
||||||
env: SWIGLANG=python CPP11=1
|
env: SWIGLANG=python CPP11=1
|
||||||
sudo: required
|
sudo: required
|
||||||
|
|
|
||||||
|
|
@ -71,21 +71,7 @@ case "$SWIGLANG" in
|
||||||
travis_retry sudo apt-get -qq install ocaml camlp4
|
travis_retry sudo apt-get -qq install ocaml camlp4
|
||||||
;;
|
;;
|
||||||
"octave")
|
"octave")
|
||||||
if [[ -z "$VER" ]]; then
|
|
||||||
travis_retry sudo apt-get -qq install liboctave-dev
|
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
|
|
||||||
;;
|
;;
|
||||||
"php")
|
"php")
|
||||||
travis_retry sudo add-apt-repository -y ppa:ondrej/php
|
travis_retry sudo add-apt-repository -y ppa:ondrej/php
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue