Skip to content

GitLab

Commit 5a4fff10 authored by Matthew Brett's avatar Matthew Brett
Browse files

Merge branch 'pr/221' into devel 

* pr/221:
  Step up distros to Xenial + Trusty
parents 61f8b7e8 fcd3d68c
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
.travis.yml
View file @ 5a4fff10
...@@ -13,21 +13,21 @@ env: ...@@ -13,21 +13,21 @@ env:
matrix: matrix:
include: include:
- os: linux - os: linux
dist: precise dist: trusty
# 64-bit builds # 64-bit builds
- os: linux - os: linux
dist: trusty dist: xenial
env: env:
- TEST_BUILDS=1 - TEST_BUILDS=1
# 32-bit builds # 32-bit builds
- os: linux - os: linux
dist: trusty dist: xenial
env: env:
- TEST_BUILDS=1 - TEST_BUILDS=1
- PLAT=i686 - PLAT=i686
# Builds with caching # Builds with caching
- os: linux - os: linux
dist: trusty dist: xenial
env: env:
- TEST_BUILDS=1 - TEST_BUILDS=1
- USE_CCACHE=1 - USE_CCACHE=1
......
README.rst
View file @ 5a4fff10
...@@ -209,8 +209,10 @@ To use these scripts ...@@ -209,8 +209,10 @@ To use these scripts
# Required in Linux to invoke `docker' ourselves # Required in Linux to invoke `docker' ourselves
services: docker services: docker
# A newer distro will also do
dist: trusty # Host distribution. This is the distribution from which we run the build
# and test containers, via docker.
dist: xenial
matrix: matrix:
include: include:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment