Commit 27aed4e9 authored by peastman's avatar peastman Committed by GitHub
Browse files

Merge pull request #1774 from peastman/ssl

Fix errors on travis downloading files
parents 08e8b206 b00d9520
...@@ -73,6 +73,7 @@ matrix: ...@@ -73,6 +73,7 @@ matrix:
addons: {apt: {packages: []}} addons: {apt: {packages: []}}
- sudo: false - sudo: false
dist: trusty
python: 2.7_with_system_site_packages python: 2.7_with_system_site_packages
env: ==STATIC_LIB== env: ==STATIC_LIB==
OPENCL=false OPENCL=false
...@@ -82,6 +83,7 @@ matrix: ...@@ -82,6 +83,7 @@ matrix:
CMAKE_FLAGS="-DOPENMM_BUILD_STATIC_LIB=ON" CMAKE_FLAGS="-DOPENMM_BUILD_STATIC_LIB=ON"
- sudo: false - sudo: false
dist: trusty
python: 2.7_with_system_site_packages python: 2.7_with_system_site_packages
env: ==PYTHON_2== env: ==PYTHON_2==
OPENCL=false OPENCL=false
...@@ -92,6 +94,7 @@ matrix: ...@@ -92,6 +94,7 @@ matrix:
CMAKE_FLAGS="-DOPENMM_GENERATE_API_DOCS=ON" CMAKE_FLAGS="-DOPENMM_GENERATE_API_DOCS=ON"
- sudo: false - sudo: false
dist: trusty
python: 3.4 python: 3.4
env: ==PYTHON_3== env: ==PYTHON_3==
OPENCL=false OPENCL=false
...@@ -102,7 +105,7 @@ matrix: ...@@ -102,7 +105,7 @@ matrix:
before_install: before_install:
- START_TIME=$(date +%s) - START_TIME=$(date +%s)
- wget https://anaconda.org/omnia/ccache/3.2.4/download/${TRAVIS_OS_NAME}-64/ccache-3.2.4-0.tar.bz2 - wget http://anaconda.org/omnia/ccache/3.2.4/download/${TRAVIS_OS_NAME}-64/ccache-3.2.4-0.tar.bz2
- mkdir -p $HOME/ccache && tar xf ccache-3.2.4-0.tar.bz2 -C $HOME/ccache - mkdir -p $HOME/ccache && tar xf ccache-3.2.4-0.tar.bz2 -C $HOME/ccache
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
brew install fftw; brew install fftw;
...@@ -110,7 +113,7 @@ before_install: ...@@ -110,7 +113,7 @@ before_install:
sudo easy_install pytest; sudo easy_install pytest;
fi fi
- if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
CMAKE_URL="https://cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz"; CMAKE_URL="http://cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz";
mkdir $HOME/cmake && travis_retry wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C $HOME/cmake; mkdir $HOME/cmake && travis_retry wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C $HOME/cmake;
export PATH=${HOME}/cmake/bin:${PATH}; export PATH=${HOME}/cmake/bin:${PATH};
fi fi
...@@ -131,14 +134,14 @@ before_install: ...@@ -131,14 +134,14 @@ before_install:
# but this is a fast way to get an apparently functional precompiled # but this is a fast way to get an apparently functional precompiled
# build of swig that's more modern than what's in apt. # build of swig that's more modern than what's in apt.
- if [[ "$OPENCL" == "false" && "$CUDA" == "false" && "$TRAVIS_OS_NAME" == "linux" ]]; then - if [[ "$OPENCL" == "false" && "$CUDA" == "false" && "$TRAVIS_OS_NAME" == "linux" ]]; then
wget https://anaconda.org/omnia/swig/3.0.7/download/linux-64/swig-3.0.7-0.tar.bz2; wget http://anaconda.org/omnia/swig/3.0.7/download/linux-64/swig-3.0.7-0.tar.bz2;
mkdir $HOME/swig; mkdir $HOME/swig;
tar -xjvf swig-3.0.7-0.tar.bz2 -C $HOME/swig; tar -xjvf swig-3.0.7-0.tar.bz2 -C $HOME/swig;
export PATH=$HOME/swig/bin:$PATH; export PATH=$HOME/swig/bin:$PATH;
export SWIG_LIB=$HOME/swig/share/swig/3.0.7; export SWIG_LIB=$HOME/swig/share/swig/3.0.7;
fi fi
- if [[ "$OPENCL" == "false" && "$CUDA" == "false" && "$TRAVIS_OS_NAME" == "osx" ]]; then - if [[ "$OPENCL" == "false" && "$CUDA" == "false" && "$TRAVIS_OS_NAME" == "osx" ]]; then
wget https://anaconda.org/omnia/swig/3.0.7/download/osx-64/swig-3.0.7-0.tar.bz2; wget http://anaconda.org/omnia/swig/3.0.7/download/osx-64/swig-3.0.7-0.tar.bz2;
mkdir $HOME/swig; mkdir $HOME/swig;
tar -xjvf swig-3.0.7-0.tar.bz2 -C $HOME/swig; tar -xjvf swig-3.0.7-0.tar.bz2 -C $HOME/swig;
export PATH=$HOME/swig/bin:$PATH; export PATH=$HOME/swig/bin:$PATH;
......
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