mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-29 08:32:02 +00:00
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.
This commit is contained in:
parent
13d8cd2cc7
commit
e067c5842b
@ -97,8 +97,8 @@ before_install:
|
|||||||
fi
|
fi
|
||||||
export CXX=g++-$GCC CC=gcc-$GCC
|
export CXX=g++-$GCC CC=gcc-$GCC
|
||||||
fi
|
fi
|
||||||
if [ "$GCC" = "6" ] || [ "$CLANG" = "3.9" ]; then DOCKER=${ARCH:+$ARCH/}debian:testing
|
if [ "$GCC" = "6" ] || [ "$CLANG" = "3.9" ]; then DOCKER=${ARCH:+$ARCH/}debian:stretch
|
||||||
elif [ "$GCC" = "7" ]; then DOCKER=debian:experimental APT_GET_EXTRA="-t experimental"
|
elif [ "$GCC" = "7" ]; then DOCKER=debian:sid
|
||||||
fi
|
fi
|
||||||
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
|
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
|
||||||
export CXX=clang++ CC=clang;
|
export CXX=clang++ CC=clang;
|
||||||
@ -150,7 +150,7 @@ install:
|
|||||||
CMAKE_EXTRA_ARGS="${CMAKE_EXTRA_ARGS} -DPYTHON_EXECUTABLE=/usr/bin/python${PYTHON}dm"
|
CMAKE_EXTRA_ARGS="${CMAKE_EXTRA_ARGS} -DPYTHON_EXECUTABLE=/usr/bin/python${PYTHON}dm"
|
||||||
fi
|
fi
|
||||||
$SCRIPT_RUN_PREFIX sh -c "for s in 0 15; do sleep \$s; \
|
$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 \
|
$PY_DEBUG python$PY-dev python$PY-pytest python$PY-scipy \
|
||||||
libeigen3-dev cmake make ${COMPILER_PACKAGES} && break; done"
|
libeigen3-dev cmake make ${COMPILER_PACKAGES} && break; done"
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user