Commit 8977eb2b authored by Matthew Brett's avatar Matthew Brett
Browse files

MAINT: Refactor docker builds for platforms

Skip build tests if no docker available.

(There is no docker available for precise, so skip the builds for
precise).

Specify platform with env var, test 32 and 64 bit builds.
parent c909ecb2
...@@ -6,23 +6,35 @@ cache: ...@@ -6,23 +6,35 @@ cache:
directories: directories:
- $HOME/.ccache - $HOME/.ccache
env:
global:
- PLAT=x86_64
matrix: matrix:
include: include:
- os: linux - os: linux
dist: precise dist: precise
# 64-bit builds
- os: linux
dist: trusty
env: env:
- TEST_BUILDS=1 - TEST_BUILDS=1
sudo: required
# 32-bit builds
- os: linux - os: linux
dist: trusty dist: trusty
env: env:
- TEST_BUILDS=1 - TEST_BUILDS=1
- PLAT=i686
sudo: required sudo: required
# Builds with caching
- os: linux - os: linux
dist: trusty dist: trusty
env: env:
- TEST_BUILDS=1 - TEST_BUILDS=1
- USE_CCACHE=1 - USE_CCACHE=1
sudo: required sudo: required
# OSX builds
- os: osx - os: osx
osx_image: xcode6.4 osx_image: xcode6.4
env: env:
......
...@@ -18,12 +18,14 @@ else ...@@ -18,12 +18,14 @@ else
source tests/test_manylinux_utils.sh source tests/test_manylinux_utils.sh
fi fi
if [ -n "$TEST_BUILDS" ]; then if [ -n "$TEST_BUILDS" ]; then
if [ -n "$IS_OSX" ] || [ ! -x "$(command -v docker)" ]; then if [ -n "$IS_OSX" ]; then
source tests/test_library_builders.sh source tests/test_library_builders.sh
elif [ ! -x "$(command -v docker)" ]; then
echo "Skipping build tests; no docker available"
else else
touch config.sh touch config.sh
source travis_linux_steps.sh source travis_linux_steps.sh
build_multilinux i686 "source tests/test_library_builders.sh" build_multilinux $PLAT "source tests/test_library_builders.sh"
fi fi
fi fi
......
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