Skip to content

Commit 9a271ed

Browse files
authored
Merge pull request #565 from k-okada/fix_travis
use travis by using bionic@travis
2 parents 8902642 + fc4f433 commit 9a271ed

File tree

1 file changed

+6
-32
lines changed

1 file changed

+6
-32
lines changed

.travis.yml

Lines changed: 6 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,57 +6,31 @@ notifications:
66
on_success: always #[always|never|change] # default: change
77
on_failure: always #[always|never|change] # default: always
88
slack: jsk-robotics:Av7tc8wj3IWkLYvlTzHE7x2g
9+
dist: bionic
10+
sudo: required
11+
cache: apt
12+
services: docker
913
matrix:
1014
include:
1115
- os: linux
12-
dist: trusty
13-
sudo: required
14-
cache: apt
1516
env: DOCKER_IMAGE=ubuntu:trusty
1617
- os: linux
17-
dist: trusty
18-
sudo: required
19-
cache: apt
2018
env: DOCKER_IMAGE=ubuntu:xenial
2119
- os: linux
22-
dist: trusty
23-
sudo: required
24-
cache: apt
2520
env: DOCKER_IMAGE=ubuntu:bionic
2621
- os: linux
27-
dist: trusty
28-
sudo: required
29-
cache: apt
3022
env: DOCKER_IMAGE=osrf/ubuntu_armhf:trusty
3123
- os: linux
32-
dist: trusty
33-
sudo: required
34-
cache: apt
3524
env: DOCKER_IMAGE=osrf/ubuntu_armhf:xenial
3625
- os: linux
37-
dist: trusty
38-
sudo: required
39-
cache: apt
4026
env: DOCKER_IMAGE=osrf/ubuntu_arm64:trusty
4127
- os: linux
42-
dist: trusty
43-
sudo: required
44-
cache: apt
4528
env: DOCKER_IMAGE=osrf/ubuntu_arm64:xenial
4629
- os: linux
47-
dist: trusty
48-
sudo: required
49-
cache: apt
5030
env: DOCKER_IMAGE=debian:stretch
5131
- os: linux
52-
dist: trusty
53-
sudo: required
54-
cache: apt
5532
env: DOCKER_IMAGE=osrf/debian_arm64:stretch
5633
- os: linux
57-
dist: trusty
58-
sudo: required
59-
cache: apt
6034
env: BUILD_DOC=true
6135
- os: osx
6236
# allow_failures:
@@ -75,9 +49,9 @@ script:
7549
# Test installing head version jskeus via Homebrew formula
7650
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then $CI_SOURCE_PATH/.travis-osx.sh; fi
7751
# Test doc generation
78-
- if [ "$BUILD_DOC" == "true" ]; then sudo apt-get install -y -qq git make gcc g++ libjpeg-dev libxext-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev libpq-dev libpng12-dev xfonts-100dpi xfonts-75dpi pkg-config libbullet-dev; fi
52+
- if [ "$BUILD_DOC" == "true" ]; then sudo apt-get install -y -qq git make gcc g++ libjpeg-dev libxext-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev libpq-dev libpng-dev xfonts-100dpi xfonts-75dpi pkg-config libbullet-dev; fi
7953
- if [ "$BUILD_DOC" == "true" ]; then make; fi
80-
- if [ "$BUILD_DOC" == "true" ]; then sudo apt-get install -y -qq texlive-binaries texlive-lang-cjk poppler-utils nkf latex2html; fi
54+
- if [ "$BUILD_DOC" == "true" ]; then sudo apt-get install -y -qq texlive-binaries texlive-lang-cjk texlive-lang-japanese poppler-utils nkf latex2html; fi
8155
- if [ "$BUILD_DOC" == "true" ]; then (source bashrc.eus; cd doc/; make pdf); fi
8256
- if [ "$BUILD_DOC" == "true" ]; then (source bashrc.eus; cd doc/; make html); fi
8357
after_failure:

0 commit comments

Comments
 (0)