Unverified Commit 7b335017 authored by Nikita Titov's avatar Nikita Titov Committed by GitHub
Browse files

minor CI scripts update (#3019)

parent 02a0089f
...@@ -17,7 +17,7 @@ if [[ $OS_NAME == "macos" ]]; then ...@@ -17,7 +17,7 @@ if [[ $OS_NAME == "macos" ]]; then
if [[ $AZURE == "true" ]] && [[ $TASK == "sdist" ]]; then if [[ $AZURE == "true" ]] && [[ $TASK == "sdist" ]]; then
brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/f3544543a3115023fc7ca962c21d14b443f419d0/Formula/swig.rb # swig 3.0.12 brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/f3544543a3115023fc7ca962c21d14b443f419d0/Formula/swig.rb # swig 3.0.12
fi 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 else # Linux
if [[ $TASK == "mpi" ]]; then if [[ $TASK == "mpi" ]]; then
sudo apt-get update sudo apt-get update
...@@ -37,7 +37,7 @@ else # Linux ...@@ -37,7 +37,7 @@ else # Linux
echo libamdocl64.so > $OPENCL_VENDOR_PATH/amdocl64.icd echo libamdocl64.so > $OPENCL_VENDOR_PATH/amdocl64.icd
fi fi
if [[ $TRAVIS == "true" ]]; then 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
fi fi
......
...@@ -34,11 +34,6 @@ fi ...@@ -34,11 +34,6 @@ fi
# Installing R precompiled for Mac OS 10.11 or higher # Installing R precompiled for Mac OS 10.11 or higher
if [[ $OS_NAME == "macos" ]]; then if [[ $OS_NAME == "macos" ]]; then
# temp fix for basictex
if [[ $AZURE == "true" ]]; then
brew update
fi
brew install qpdf brew install qpdf
brew cask install basictex brew cask install basictex
export PATH="/Library/TeX/texbin:$PATH" export PATH="/Library/TeX/texbin:$PATH"
...@@ -113,5 +108,3 @@ if [[ ${NUM_CHECK_NOTES} -gt ${ALLOWED_CHECK_NOTES} ]]; then ...@@ -113,5 +108,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" echo "Found ${NUM_CHECK_NOTES} NOTEs from R CMD check. Only ${ALLOWED_CHECK_NOTES} are allowed"
exit -1 exit -1
fi fi
exit 0
...@@ -8,7 +8,7 @@ os: ...@@ -8,7 +8,7 @@ os:
- linux - linux
- osx - osx
dist: bionic dist: bionic
osx_image: xcode11.3 osx_image: xcode11.4
env: env:
global: # default values global: # default values
......
...@@ -13,7 +13,7 @@ RUN apt-get update && \ ...@@ -13,7 +13,7 @@ RUN apt-get update && \
git \ git \
wget && \ wget && \
# python environment # 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 && \ /bin/bash Miniconda3-latest-Linux-x86_64.sh -f -b -p $CONDA_DIR && \
export PATH="$CONDA_DIR/bin:$PATH" && \ export PATH="$CONDA_DIR/bin:$PATH" && \
conda config --set always_yes yes --set changeps1 no && \ conda config --set always_yes yes --set changeps1 no && \
......
...@@ -70,7 +70,7 @@ ENV PATH $CONDA_DIR/bin:$PATH ...@@ -70,7 +70,7 @@ ENV PATH $CONDA_DIR/bin:$PATH
# Install miniconda # Install miniconda
RUN echo "export PATH=$CONDA_DIR/bin:"'$PATH' > /etc/profile.d/conda.sh && \ 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 && \ /bin/bash ~/miniconda.sh -b -p $CONDA_DIR && \
rm ~/miniconda.sh rm ~/miniconda.sh
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment