Skip to content

Commit ad3d886

Browse files
committed
CI: don't fail if our env already exists in caching
1 parent 0ad8976 commit ad3d886

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

ci/install_travis.sh

+7-4
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ else
4747

4848
# install miniconda
4949
if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
50-
wget http://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh || exit 1
50+
time wget http://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh || exit 1
5151
else
52-
wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh || exit 1
52+
time wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh || exit 1
5353
fi
54-
bash miniconda.sh -b -p "$MINICONDA_DIR" || exit 1
54+
time bash miniconda.sh -b -p "$MINICONDA_DIR" || exit 1
5555
fi
5656

5757
echo "[show conda]"
@@ -90,13 +90,16 @@ else
9090
echo "[Not using ccache]"
9191
fi
9292

93+
echo "[create env]"
94+
9395
# may have installation instructions for this build
9496
INSTALL="ci/install-${PYTHON_VERSION}${JOB_TAG}.sh"
9597
if [ -e ${INSTALL} ]; then
9698
time bash $INSTALL || exit 1
9799
else
98100
# create new env
99-
time conda create -n pandas python=$PYTHON_VERSION pytest || exit 1
101+
# this may already exists, in which case our caching worked
102+
time conda create -n pandas python=$PYTHON_VERSION pytest
100103
fi
101104

102105
# build deps

0 commit comments

Comments
 (0)