spread CI work over targets

This commit is contained in:
Valient Gough 2017-08-25 23:00:11 -07:00
parent 64c3b4459c
commit 1e43b05712
No known key found for this signature in database
GPG Key ID: 33C65E29813C14DF
3 changed files with 12 additions and 11 deletions

View File

@ -5,7 +5,7 @@ matrix:
- os: linux - os: linux
compiler: gcc compiler: gcc
dist: trusty dist: trusty
sudo: false sudo: required
addons: addons:
apt: apt:
sources: sources:
@ -17,12 +17,12 @@ matrix:
- gettext - gettext
- cmake3 - cmake3
env: env:
- INTEGRATION=false - SUDO_TESTS=true
- os: linux - os: linux
compiler: clang compiler: clang
dist: trusty dist: trusty
sudo: true sudo: false
addons: addons:
apt: apt:
sources: sources:
@ -37,14 +37,14 @@ matrix:
- clang-4.0 - clang-4.0
- clang-tidy-4.0 - clang-tidy-4.0
env: env:
- CC=clang-4.0 CXX=clang++-4.0 CHECK=true INTEGRATION=true SUDO_TESTS=true - CC=clang-4.0 CXX=clang++-4.0 CHECK=true INTEGRATION=false CMAKE=/tmp/bin/cmake
- os: osx - os: osx
compiler: clang compiler: clang
osx_image: xcode8.3 osx_image: xcode8.3
sudo: true sudo: required
env: env:
- INTEGRATION=true SUDO_TESTS=true - SUDO_TESTS=true
before_script: before_script:
- ./ci/setup.sh - ./ci/setup.sh

View File

@ -1,9 +1,10 @@
#!/bin/bash -eu #!/bin/bash -eu
: ${CMAKE:=cmake}
: ${CHECK:=false} : ${CHECK:=false}
: ${INTEGRATION:=true} : ${INTEGRATION:=true}
cmake --version ${CMAKE} --version
CFG=$* CFG=$*
if [[ "$CHECK" == "true" ]]; then if [[ "$CHECK" == "true" ]]; then
@ -20,7 +21,7 @@ then
fi fi
cd build cd build
cmake .. ${CFG} ${CMAKE} .. ${CFG}
make -j2 make -j2
make test make test
if [[ "$INTEGRATION" == "true" ]]; then if [[ "$INTEGRATION" == "true" ]]; then

View File

@ -1,6 +1,6 @@
#!/bin/bash -eu #!/bin/bash -eu
: ${INTEGRATION:=false} : ${INTEGRATION:=true}
: ${CHECK:=false} : ${CHECK:=false}
if [[ "$INTEGRATION" == "true" ]]; then if [[ "$INTEGRATION" == "true" ]]; then
@ -15,8 +15,8 @@ if [[ "$CHECK" == "true" ]]; then
if uname -s | grep -q Linux; then if uname -s | grep -q Linux; then
wget https://cmake.org/files/v3.9/cmake-3.9.1-Linux-x86_64.tar.gz -O /tmp/cmake.tar.gz wget https://cmake.org/files/v3.9/cmake-3.9.1-Linux-x86_64.tar.gz -O /tmp/cmake.tar.gz
tar -C /tmp/ -xf /tmp/cmake.tar.gz tar -C /tmp/ -xf /tmp/cmake.tar.gz
sudo rm -f $(which cmake) mkdir /tmp/bin
sudo ln -s $(ls -1 /tmp/cmake*/bin/cmake) /bin/ ln -s $(ls -1 /tmp/cmake*/bin/cmake) /tmp/bin/
fi fi
fi fi