From 3b6ea5c6a2d69c2d8485979472336895c1de84fc Mon Sep 17 00:00:00 2001 From: StrikerRUS Date: Wed, 22 Apr 2020 20:34:05 +0300 Subject: [PATCH] minor CI scripts update --- .ci/setup.sh | 4 ++-- .ci/test_r_package.sh | 7 ------- .travis.yml | 2 +- docker/dockerfile-python | 2 +- docker/gpu/dockerfile.gpu | 2 +- 5 files changed, 5 insertions(+), 12 deletions(-) diff --git a/.ci/setup.sh b/.ci/setup.sh index 39370fa27604..0c4101189346 100755 --- a/.ci/setup.sh +++ b/.ci/setup.sh @@ -17,7 +17,7 @@ if [[ $OS_NAME == "macos" ]]; then if [[ $AZURE == "true" ]] && [[ $TASK == "sdist" ]]; then brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/f3544543a3115023fc7ca962c21d14b443f419d0/Formula/swig.rb # swig 3.0.12 fi - wget -q -O conda.sh https://repo.continuum.io/miniconda/Miniconda${PYTHON_VERSION:0:1}-latest-MacOSX-x86_64.sh + wget -q -O conda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh else # Linux if [[ $TASK == "mpi" ]]; then sudo apt-get update @@ -37,7 +37,7 @@ else # Linux echo libamdocl64.so > $OPENCL_VENDOR_PATH/amdocl64.icd fi if [[ $TRAVIS == "true" ]]; then - wget -q -O conda.sh https://repo.continuum.io/miniconda/Miniconda${PYTHON_VERSION:0:1}-latest-Linux-x86_64.sh + wget -q -O conda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh fi fi diff --git a/.ci/test_r_package.sh b/.ci/test_r_package.sh index 4dddd36225f4..b803342d5f34 100755 --- a/.ci/test_r_package.sh +++ b/.ci/test_r_package.sh @@ -34,11 +34,6 @@ fi # Installing R precompiled for Mac OS 10.11 or higher if [[ $OS_NAME == "macos" ]]; then - - # temp fix for basictex - if [[ $AZURE == "true" ]]; then - brew update - fi brew install qpdf brew cask install basictex export PATH="/Library/TeX/texbin:$PATH" @@ -105,5 +100,3 @@ if [[ ${NUM_CHECK_NOTES} -gt ${ALLOWED_CHECK_NOTES} ]]; then echo "Found ${NUM_CHECK_NOTES} NOTEs from R CMD check. Only ${ALLOWED_CHECK_NOTES} are allowed" exit -1 fi - -exit 0 diff --git a/.travis.yml b/.travis.yml index acba8bfc3ad0..3f13504929c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ os: - linux - osx dist: bionic -osx_image: xcode11.3 +osx_image: xcode11.4 env: global: # default values diff --git a/docker/dockerfile-python b/docker/dockerfile-python index b157b41117ba..29fc4ece5b41 100644 --- a/docker/dockerfile-python +++ b/docker/dockerfile-python @@ -13,7 +13,7 @@ RUN apt-get update && \ git \ wget && \ # python environment - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh && \ + wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh && \ /bin/bash Miniconda3-latest-Linux-x86_64.sh -f -b -p $CONDA_DIR && \ export PATH="$CONDA_DIR/bin:$PATH" && \ conda config --set always_yes yes --set changeps1 no && \ diff --git a/docker/gpu/dockerfile.gpu b/docker/gpu/dockerfile.gpu index c4801d6e462f..08c243a57bce 100644 --- a/docker/gpu/dockerfile.gpu +++ b/docker/gpu/dockerfile.gpu @@ -70,7 +70,7 @@ ENV PATH $CONDA_DIR/bin:$PATH # Install miniconda RUN echo "export PATH=$CONDA_DIR/bin:"'$PATH' > /etc/profile.d/conda.sh && \ - wget --quiet https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh && \ + wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh && \ /bin/bash ~/miniconda.sh -b -p $CONDA_DIR && \ rm ~/miniconda.sh