File tree Expand file tree Collapse file tree 2 files changed +1
-20
lines changed Expand file tree Collapse file tree 2 files changed +1
-20
lines changed Original file line number Diff line number Diff line change @@ -322,11 +322,6 @@ matrix:
322
322
env : SWIGLANG=java CPP11=1
323
323
sudo : required
324
324
dist : xenial
325
- - compiler : gcc
326
- os : linux
327
- env : SWIGLANG=octave SWIGJOBS=-j2 VER=4.4 CPP11=1
328
- sudo : required
329
- dist : trusty
330
325
- os : linux
331
326
env : SWIGLANG=python CPP11=1
332
327
sudo : required
Original file line number Diff line number Diff line change @@ -71,21 +71,7 @@ case "$SWIGLANG" in
71
71
travis_retry sudo apt-get -qq install ocaml camlp4
72
72
;;
73
73
" octave" )
74
- if [[ -z " $VER " ]]; then
75
- travis_retry sudo apt-get -qq install liboctave-dev
76
- else
77
- # Travis adds external PPAs which contain newer versions of packages
78
- # than in baseline trusty. These newer packages prevent some of the
79
- # Octave packages in ppa:kwwette/octave, which rely on the older
80
- # packages in trusty, from installing. To prevent these kind of
81
- # interactions arising, clean out all external PPAs added by Travis
82
- # before installing Octave
83
- sudo rm -rf /etc/apt/sources.list.d/*
84
- travis_retry sudo apt-get -qq update
85
- travis_retry sudo add-apt-repository -y ppa:kwwette/octaves
86
- travis_retry sudo apt-get -qq update
87
- travis_retry sudo apt-get -qq install liboctave${VER} -dev
88
- fi
74
+ travis_retry sudo apt-get -qq install liboctave-dev
89
75
;;
90
76
" php" )
91
77
travis_retry sudo add-apt-repository -y ppa:ondrej/php
You can’t perform that action at this time.
0 commit comments