From e067c5842bf2b55b3f06a6afbe3f1bb3e10fd1e7 Mon Sep 17 00:00:00 2001 From: Jason Rhinelander Date: Sun, 18 Jun 2017 12:55:00 -0400 Subject: [PATCH] Switch debian docker images to stretch Debian stretch was just released, so `debian:testing` and `debian:stetch` are starting to diverge; this commit keeps the travis-ci docker image on stretch for gcc6 and clang3.9. Debian has also moved gcc 7 from experimental to unstable, so this switches the gcc7 build to `sid`. Once it migrates to `testing` I'll switch the gcc 7 build docker image to `testing` and take it out of failure-allowed. --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 860234b63..9bc55b831 100644 --- a/.travis.yml +++ b/.travis.yml @@ -97,8 +97,8 @@ before_install: fi export CXX=g++-$GCC CC=gcc-$GCC fi - if [ "$GCC" = "6" ] || [ "$CLANG" = "3.9" ]; then DOCKER=${ARCH:+$ARCH/}debian:testing - elif [ "$GCC" = "7" ]; then DOCKER=debian:experimental APT_GET_EXTRA="-t experimental" + if [ "$GCC" = "6" ] || [ "$CLANG" = "3.9" ]; then DOCKER=${ARCH:+$ARCH/}debian:stretch + elif [ "$GCC" = "7" ]; then DOCKER=debian:sid fi elif [ "$TRAVIS_OS_NAME" = "osx" ]; then export CXX=clang++ CC=clang; @@ -150,7 +150,7 @@ install: CMAKE_EXTRA_ARGS="${CMAKE_EXTRA_ARGS} -DPYTHON_EXECUTABLE=/usr/bin/python${PYTHON}dm" fi $SCRIPT_RUN_PREFIX sh -c "for s in 0 15; do sleep \$s; \ - apt-get -qy --no-install-recommends $APT_GET_EXTRA install \ + apt-get -qy --no-install-recommends install \ $PY_DEBUG python$PY-dev python$PY-pytest python$PY-scipy \ libeigen3-dev cmake make ${COMPILER_PACKAGES} && break; done" else