Skip to content

Commit 8e0aac9

Browse files
d-a-vdevyte
authored andcommitted
CI: trusty (u14.04) -> bionic (u18.04) (#6627)
* no-op test * no-op test * bionic * missing python package for doc building with bionic * fix previous commit * remove external repo for gcc7 (causing issues), it is default under bionic fix python3-setuptools install * tryfix git submodule recursive (git 2.21/2.22 ?)
1 parent 5af402e commit 8e0aac9

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

.travis.yml

+2-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: bash
22
os: linux
3-
dist: trusty
3+
dist: bionic
44

55
git:
66
depth: 1
@@ -80,17 +80,13 @@ jobs:
8080
stage: build
8181
script: $TRAVIS_BUILD_DIR/tests/ci/host_test.sh
8282
install:
83-
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
84-
- sudo apt-get update -q
85-
- sudo apt-get install -y --allow-unauthenticated g++-7 gcc-7
8683
- sudo apt-get install valgrind lcov
87-
env: CC=gcc-7 CXX=g++-7
8884

8985
- name: "Docs"
9086
stage: build
9187
script: $TRAVIS_BUILD_DIR/tests/ci/build_docs.sh
9288
install:
93-
- sudo apt-get install python3-pip
89+
- sudo apt-get install python3-pip python3-setuptools
9490
- pip3 install --user -r doc/requirements.txt;
9591

9692
- name: "Style check"
@@ -101,11 +97,6 @@ jobs:
10197
- name: "Mock trivial test"
10298
stage: build
10399
script: $TRAVIS_BUILD_DIR/tests/buildm.sh
104-
install:
105-
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
106-
- sudo apt-get update -q
107-
- sudo apt-get install -y --allow-unauthenticated g++-7 gcc-7
108-
env: CC=gcc-7 CXX=g++-7
109100

110101
- name: "Mac OSX can build sketches"
111102
os: osx

tests/ci/style_check.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ${org}/../restyle.sh
99

1010
# Revert changes which astyle might have done to the submodules,
1111
# as we don't want to fail the build because of the 3rd party libraries
12-
git submodule foreach --recursive git reset --hard
12+
git --version || true
13+
git submodule foreach --recursive 'git reset --hard'
1314

1415
git diff --exit-code -- $TRAVIS_BUILD_DIR/libraries

0 commit comments

Comments
 (0)