Skip to content

Commit e4c38f0

Browse files
kwwetteojwb
authored andcommitted
Octave: remove use of ppa:kwwette/octaves
1 parent 97a107e commit e4c38f0

File tree

2 files changed

+1
-20
lines changed

2 files changed

+1
-20
lines changed

.travis.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -322,11 +322,6 @@ matrix:
322322
env: SWIGLANG=java CPP11=1
323323
sudo: required
324324
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
330325
- os: linux
331326
env: SWIGLANG=python CPP11=1
332327
sudo: required

Tools/travis-linux-install.sh

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -71,21 +71,7 @@ case "$SWIGLANG" in
7171
travis_retry sudo apt-get -qq install ocaml camlp4
7272
;;
7373
"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
8975
;;
9076
"php")
9177
travis_retry sudo add-apt-repository -y ppa:ondrej/php

0 commit comments

Comments
 (0)