diff --git a/.travis.yml b/.travis.yml index 49f06ba7..664dbe75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,25 +6,30 @@ git: matrix: include: - os: linux + compiler: gcc env: NAME="Ubuntu Linux (Latest)" NAME_SUFFIX="ubuntu" services: docker script: - scripts/docker/docker_travis.sh "ubuntu_latest.docker" - os: linux - env: NAME="Fedora Linux (Latest)" NAME_SUFFIX="fedora" + compiler: clang + env: NAME="Fedora Linux (Latest)" NAME_SUFFIX="fedora-llvm" services: docker script: - scripts/docker/docker_travis.sh "fedora_latest.docker" - os: linux + compiler: gcc env: NAME="Arch Linux (Latest)" NAME_SUFFIX="arch" DEBUG=1 services: docker script: - scripts/docker/docker_travis.sh "arch_latest.docker" - os: linux + compiler: gcc env: NAME="conan" NAME_SUFFIX="conan" USE_CONAN=1 script: - scripts/docker/docker_travis.sh "conan_base.docker" - os: osx + compiler: clang env: NAME="Apple macOS" NAME_SUFFIX="mac" osx_image: xcode9.4 install: diff --git a/scripts/docker/docker_travis.sh b/scripts/docker/docker_travis.sh index 34c5fca3..f572362f 100755 --- a/scripts/docker/docker_travis.sh +++ b/scripts/docker/docker_travis.sh @@ -18,8 +18,11 @@ docker=$1 TRAVIS_BRANCH=$TRAVIS_BRANCH \ USE_CONAN=$USE_CONAN \ ALSOFT_DRIVERS=null \ + CC=$CC \ + CXX=$CXX \ DEBUG=$DEBUG \ XDG_RUNTIME_DIR=/tmp # execute test -"$curdir/docker_tool.py" exec -n openrw_builder -U travis -- /bin/bash -c "ctest -VV -S /src/cmake/ctest/script_ci.ctest -VV" +"$curdir/docker_tool.py" exec -n openrw_builder -U travis -- /bin/bash -c \ + "ctest -VV -S /src/cmake/ctest/script_ci.ctest -VV"