Permalink
Browse files

Merge pull request #1517 from peternewman/0.10-travis-xenial

Switch to Xenial on Travis
  • Loading branch information...
peternewman committed Nov 30, 2018
2 parents abee094 + 89b1cc3 commit 8fe09c4402dd54d41eff2479a448a2882ce4c9ea
Showing with 20 additions and 20 deletions.
  1. +19 −19 .travis.yml
  2. +1 −1 doxygen/rpc.dox
@@ -86,7 +86,7 @@ matrix:
- CPPUNIT='1.14'
- LIBFTDI='1'
- os: linux
dist: trusty
dist: xenial
compiler: clang
env: TASK='compile'
python: '2.7'
@@ -96,9 +96,9 @@ matrix:
- *core_build_clang_latest
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-trusty-6.0
- llvm-toolchain-xenial-6.0
- os: linux
dist: trusty
dist: xenial
compiler: gcc
env: TASK='compile'
python: '2.7'
@@ -109,7 +109,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test
- os: linux
dist: trusty
dist: xenial
compiler: gcc
env: TASK='coverage'
addons:
@@ -119,7 +119,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test
- os: linux
dist: trusty
dist: xenial
compiler: gcc
env: TASK='coverity'
addons:
@@ -131,7 +131,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test
- os: linux
dist: trusty
dist: xenial
# Short duration job, use the container/without sudo image as it boots faster
sudo: false
env: TASK='doxygen'
@@ -144,7 +144,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test
- os: linux
dist: trusty
dist: xenial
# Short duration job, use the container/without sudo image as it boots faster
sudo: false
env: TASK='lint'
@@ -153,7 +153,7 @@ matrix:
packages:
- *core_build
- os: linux
dist: trusty
dist: xenial
# Short duration job, use the container/without sudo image as it boots faster
sudo: false
env: TASK='check-licences'
@@ -162,7 +162,7 @@ matrix:
packages:
- *core_build
- os: linux
dist: trusty
dist: xenial
# Short duration job, would use the container/without sudo image as it boots faster, but we need a backported lintian, so don't
sudo: required
env: TASK='spellintian'
@@ -172,7 +172,7 @@ matrix:
- *core_build
- moreutils
- os: linux
dist: trusty
dist: xenial
# Short duration job, would use the container/without sudo image as it boots faster, but we need a backported lintian, so don't
sudo: required
env: TASK='spellintian-duplicates'
@@ -182,7 +182,7 @@ matrix:
- *core_build
- moreutils
- os: linux
dist: trusty
dist: xenial
# Short duration job, use the container/without sudo image as it boots faster
sudo: false
env: TASK='codespell'
@@ -192,15 +192,15 @@ matrix:
- *core_build
- moreutils
- os: linux
dist: trusty
dist: xenial
# Short duration job, use the container/without sudo image as it boots faster
sudo: false
env: TASK='jshint'
addons:
apt:
packages:
- os: linux
dist: trusty
dist: xenial
# Short duration job, use the container/without sudo image as it boots faster
sudo: false
env: TASK='flake8'
@@ -210,18 +210,18 @@ matrix:
- *base_build
allow_failures:
- os: linux
dist: trusty
dist: xenial
compiler: gcc
env: TASK='coverage'
- os: linux
dist: trusty
dist: xenial
compiler: gcc
env: TASK='coverity'
- os: linux
dist: trusty
dist: xenial
env: TASK='spellintian'
- os: linux
dist: trusty
dist: xenial
env: TASK='spellintian-duplicates'
env:
@@ -260,7 +260,7 @@ before_cache:
install:
# Match the version of protobuf being installed via apt
- pip install --user protobuf==3.1.0
# We need to use pip rather than apt on Trusty
# We need to use pip rather than apt on Xenial
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then pip install --user numpy; fi
- if [ "$TASK" = "coverage" ]; then pip install --user cpp-coveralls; fi
- if [ "$TASK" = "flake8" ]; then pip install --user flake8; fi
@@ -288,7 +288,7 @@ before_install:
- if [ "$TRAVIS_OS_NAME" == "linux" -a "$CXX" = "clang++" ]; then export CXX="clang++-6.0" CC="clang-6.0"; fi
#Report the compiler version
- $CXX --version
- if [ "$TASK" == "spellintian" -o "$TASK" == "spellintian-duplicates" ]; then sudo add-apt-repository ppa:waja/trusty-backports -y; sudo apt-get update -qq; sudo apt-get install lintian -y; fi # Install a late enough lintian
- if [ "$TASK" == "spellintian" -o "$TASK" == "spellintian-duplicates" ]; then sudo add-apt-repository ppa:waja/xenial-backports -y; sudo apt-get update -qq; sudo apt-get install lintian -y; fi # Install a late enough lintian
after_failure:
# Disabled as otherwise the logfile is too big
@@ -69,7 +69,7 @@
* The client sends the word its looking for and the server replies with the
* definition and maybe some extra information like the pronunciation and a
* list of similar words.
* ~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~
message WordQuery {
required string word = 1;
}

0 comments on commit 8fe09c4

Please sign in to comment.