From d5fc3d773ded2aa40413ab6f03c80421d26fa2f7 Mon Sep 17 00:00:00 2001 From: David Gauchard Date: Thu, 10 Oct 2019 13:49:32 +0200 Subject: [PATCH 1/7] no-op test --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1e54251c8d..4b8f650c96 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: bash os: linux -dist: trusty +dist: trusty # git: depth: 1 From 0b0203f6a8e5efffd91387225c6b0dcd26100beb Mon Sep 17 00:00:00 2001 From: David Gauchard Date: Thu, 10 Oct 2019 13:55:44 +0200 Subject: [PATCH 2/7] no-op test --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4b8f650c96..1e54251c8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: bash os: linux -dist: trusty # +dist: trusty git: depth: 1 From c1b6c7ef4ca1a19c373063a780d11c0a0434f3d3 Mon Sep 17 00:00:00 2001 From: David Gauchard Date: Thu, 10 Oct 2019 13:57:50 +0200 Subject: [PATCH 3/7] bionic --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1e54251c8d..36e882d4e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: bash os: linux -dist: trusty +dist: bionic git: depth: 1 From 3595a4654f3cb6c080439d5faab3c84f3d6a6418 Mon Sep 17 00:00:00 2001 From: David Gauchard Date: Thu, 10 Oct 2019 15:29:04 +0200 Subject: [PATCH 4/7] missing python package for doc building with bionic --- tests/ci/build_docs.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/ci/build_docs.sh b/tests/ci/build_docs.sh index 31db9f8f9f..0ba5ed4267 100755 --- a/tests/ci/build_docs.sh +++ b/tests/ci/build_docs.sh @@ -4,6 +4,8 @@ set -ev +sudo apt install python3-setuptools + cd $TRAVIS_BUILD_DIR/doc SPHINXOPTS="-W" make html From 830db777d22f645e00ba9e623263763bd8037048 Mon Sep 17 00:00:00 2001 From: David Gauchard Date: Thu, 10 Oct 2019 15:31:35 +0200 Subject: [PATCH 5/7] fix previous commit --- tests/ci/build_docs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ci/build_docs.sh b/tests/ci/build_docs.sh index 0ba5ed4267..60a99a120e 100755 --- a/tests/ci/build_docs.sh +++ b/tests/ci/build_docs.sh @@ -4,7 +4,7 @@ set -ev -sudo apt install python3-setuptools +sudo apt -y install python3-setuptools cd $TRAVIS_BUILD_DIR/doc From 25c60f0e7bb53e2719ed35443d209c115abe61e5 Mon Sep 17 00:00:00 2001 From: David Gauchard Date: Thu, 10 Oct 2019 16:09:15 +0200 Subject: [PATCH 6/7] remove external repo for gcc7 (causing issues), it is default under bionic fix python3-setuptools install --- .travis.yml | 11 +---------- tests/ci/build_docs.sh | 2 -- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 36e882d4e3..7c50c68de9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -80,17 +80,13 @@ jobs: stage: build script: $TRAVIS_BUILD_DIR/tests/ci/host_test.sh install: - - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - - sudo apt-get update -q - - sudo apt-get install -y --allow-unauthenticated g++-7 gcc-7 - sudo apt-get install valgrind lcov - env: CC=gcc-7 CXX=g++-7 - name: "Docs" stage: build script: $TRAVIS_BUILD_DIR/tests/ci/build_docs.sh install: - - sudo apt-get install python3-pip + - sudo apt-get install python3-pip python3-setuptools - pip3 install --user -r doc/requirements.txt; - name: "Style check" @@ -101,11 +97,6 @@ jobs: - name: "Mock trivial test" stage: build script: $TRAVIS_BUILD_DIR/tests/buildm.sh - install: - - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - - sudo apt-get update -q - - sudo apt-get install -y --allow-unauthenticated g++-7 gcc-7 - env: CC=gcc-7 CXX=g++-7 - name: "Mac OSX can build sketches" os: osx diff --git a/tests/ci/build_docs.sh b/tests/ci/build_docs.sh index 60a99a120e..31db9f8f9f 100755 --- a/tests/ci/build_docs.sh +++ b/tests/ci/build_docs.sh @@ -4,8 +4,6 @@ set -ev -sudo apt -y install python3-setuptools - cd $TRAVIS_BUILD_DIR/doc SPHINXOPTS="-W" make html From 361c276f72e7af7b26e220fc2f5b98bcb0e21b8e Mon Sep 17 00:00:00 2001 From: David Gauchard Date: Thu, 10 Oct 2019 16:43:51 +0200 Subject: [PATCH 7/7] tryfix git submodule recursive (git 2.21/2.22 ?) --- tests/ci/style_check.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/ci/style_check.sh b/tests/ci/style_check.sh index a6b3532426..5cba58f9fa 100755 --- a/tests/ci/style_check.sh +++ b/tests/ci/style_check.sh @@ -9,6 +9,7 @@ ${org}/../restyle.sh # Revert changes which astyle might have done to the submodules, # as we don't want to fail the build because of the 3rd party libraries -git submodule foreach --recursive git reset --hard +git --version || true +git submodule foreach --recursive 'git reset --hard' git diff --exit-code -- $TRAVIS_BUILD_DIR/libraries