Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
gaoqiong
pybind11
Commits
8d38ebed
Commit
8d38ebed
authored
Sep 10, 2016
by
Wenzel Jakob
Committed by
GitHub
Sep 10, 2016
Browse files
Merge pull request #405 from jagerman/retry-apt-get
apt-get tweaks for the docker/debian builds
parents
356bf94a
bf14cea7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
4 deletions
+3
-4
.travis.yml
.travis.yml
+3
-4
No files found.
.travis.yml
View file @
8d38ebed
...
@@ -68,8 +68,7 @@ before_install:
...
@@ -68,8 +68,7 @@ before_install:
--env="CC=$CC" --env="CXX=$CXX" --env="DEBIAN_FRONTEND=$DEBIAN_FRONTEND" \
--env="CC=$CC" --env="CXX=$CXX" --env="DEBIAN_FRONTEND=$DEBIAN_FRONTEND" \
--env=GCC_COLORS=\ \
--env=GCC_COLORS=\ \
$DOCKER)
$DOCKER)
docker exec --tty "$containerid" apt-get update
docker exec --tty "$containerid" sh -c 'for s in 0 15; do sleep $s; apt-get update && apt-get -qy dist-upgrade && break; done'
docker exec --tty "$containerid" apt-get -y upgrade
export SCRIPT_RUN_PREFIX="docker exec --tty $containerid"
export SCRIPT_RUN_PREFIX="docker exec --tty $containerid"
else
else
if [ "$TRAVIS_OS_NAME" = "linux" ]; then
if [ "$TRAVIS_OS_NAME" = "linux" ]; then
...
@@ -91,9 +90,9 @@ install:
...
@@ -91,9 +90,9 @@ install:
-
|
-
|
# Install dependencies
# Install dependencies
if [ -n "$DOCKER" ]; then
if [ -n "$DOCKER" ]; then
docker exec --tty "$containerid" apt-get -y --no-install-recommends install \
docker exec --tty "$containerid"
sh -c "for s in 0 15; do sleep \$s;
apt-get -
q
y --no-install-recommends install \
python$PYTHON-dev python$PY-pytest python$PY-scipy \
python$PYTHON-dev python$PY-pytest python$PY-scipy \
libeigen3-dev cmake make g++
libeigen3-dev cmake make g++
&& break; done"
else
else
pip install numpy scipy pytest
pip install numpy scipy pytest
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment