Skip to content

Commit

Permalink
Merge pull request #455 from rapidsai/branch-0.17
Browse files Browse the repository at this point in the history
[gpuCI] Auto-merge branch-0.17 to branch-0.18 [skip ci]
  • Loading branch information
GPUtester authored Dec 1, 2020
2 parents 5615dca + 132375b commit e398011
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion ci/cpu/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ conda list
# FIX Added to deal with Anancoda SSL verification issues during conda builds
conda config --set ssl_verify False

pip install git+https://github.com/dask/dask.git@master
pip install git+https://github.com/dask/distributed.git@master

# If nightly build, append current YYMMDD to version
Expand All @@ -66,4 +67,4 @@ logger "Upload conda pkg..."
source ci/cpu/upload-anaconda.sh

logger "Upload pypi pkg..."
source ci/cpu/upload-pypi.sh
source ci/cpu/upload-pypi.sh
8 changes: 4 additions & 4 deletions ci/gpu/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ conda list

# Install the master version of dask and distributed
if [[ "${INSTALL_DASK_MASTER}" == 1 ]]; then
logger "pip install git+https://github.com/dask/distributed.git --upgrade"
pip install "git+https://github.com/dask/distributed.git" --upgrade
logger "pip install git+https://github.com/dask/dask.git --upgrade"
pip install "git+https://github.com/dask/dask.git" --upgrade
logger "pip install git+https://github.com/dask/distributed.git@master --upgrade"
pip install "git+https://github.com/dask/distributed.git@master" --upgrade
logger "pip install git+https://github.com/dask/dask.git@master --upgrade"
pip install "git+https://github.com/dask/dask.git@master" --upgrade
fi

logger "Check versions..."
Expand Down

0 comments on commit e398011

Please sign in to comment.