Skip to content

Commit a6e2440

Browse files
authored
Merge pull request #1511 from mithro/travis-os-upgrade
travis: Upgrade OS to Bionic
2 parents fbce960 + 98c3b17 commit a6e2440

File tree

1 file changed

+5
-17
lines changed

1 file changed

+5
-17
lines changed

.travis.yml

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,11 @@
11
version: ~> 1.0
22
language: cpp
33

4-
dist: trusty
4+
dist: bionic
55
addons:
66
apt:
77
sources:
8-
- sourceline: 'ppa:george-edison55/precise-backports' # For cmake
9-
- sourceline: 'deb http://apt.llvm.org/precise llvm-toolchain-precise-3.6 main'
10-
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
11-
- sourceline: 'deb http://apt.llvm.org/trusty llvm-toolchain-trusty-6.0 main'
12-
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
13-
- sourceline: 'deb http://apt.llvm.org/trusty llvm-toolchain-trusty-7 main' # For clang-format-7
14-
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
15-
- sourceline: 'deb http://apt.llvm.org/trusty llvm-toolchain-trusty-8 main'
16-
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
178
- sourceline: 'ppa:ubuntu-toolchain-r/test'
18-
- sourceline: 'ppa:deadsnakes/ppa' # For python3.6
199
packages:
2010
- autoconf
2111
- automake
@@ -96,7 +86,7 @@ jobs:
9686
- ./dev/check-format-py.sh
9787
- stage: Test
9888
name: "Python Lint"
99-
script:
89+
script:
10090
- python3 ./dev/pylint_check.py
10191
- stage: Test
10292
name: "C++ Unit Tests"
@@ -238,18 +228,16 @@ before_script:
238228
# Switch to python 3.6.3
239229
- pyenv install -f 3.6.3
240230
- pyenv global 3.6.3
241-
242231
# Install python modules
243232
- curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
244-
- python3 get-pip.py
233+
- python3 get-pip.py
245234
- rm get-pip.py
246-
- python3 -m pip install \
235+
- python3 -m pip install \
247236
pylint \
248237
black
249-
250238
- source .github/travis/common.sh
251239
- ./.github/travis/setup.sh
252-
240+
253241
after_script:
254242
- ./.github/travis/setup.sh
255243

0 commit comments

Comments
 (0)