Switch back to building from source

a1a67247 · peastman · 001408f9 · a1a67247
Commit a1a67247 authored Apr 24, 2020 by peastman
Hide whitespace changes
Inline Side-by-side

Showing with 24 additions and 24 deletions

.travis.yml .travis.yml +24 -24

No files found.
--- a/.travis.yml
+++ b/.travis.yml
@@ -134,31 +134,31 @@ before_install:
    fi
  # The cmake version installed by apt on ARM and PPC is very old,
  # so build a more recent version from source.
-  #- if [[ "${TRAVIS_CPU_ARCH}" == "ppc64le" || "${TRAVIS_CPU_ARCH}" == "arm64" ]]; then
-  #    sudo apt remove cmake;
-  #    pushd ${HOME};
-  #    wget https://github.com/Kitware/CMake/releases/download/v3.17.1/cmake-3.17.1.tar.gz;
-  #    tar xf cmake-3.17.1.tar.gz;
-  #    cd cmake-3.17.1;
-  #    ./bootstrap --prefix=${HOME}/cmake;
-  #    make -j 4;
-  #    make install;
-  #    export PATH=${HOME}/cmake/bin:${PATH};
-  #    echo ${PATH};
-  #    popd;
-  #  fi
-  - if [[ "${TRAVIS_CPU_ARCH}" == "ppc64le" ]]; then
-      wget https://anaconda.org/conda-forge/cmake/3.17.0/download/linux-ppc64le/cmake-3.17.0-hfb1cb51_0.tar.bz2;
-      mkdir $HOME/cmake;
-      tar -xjvf cmake-3.17.0-hfb1cb51_0.tar.bz2 -C $HOME/cmake;
-      export PATH=$HOME/cmake/bin:$PATH;
-    fi
-  - if [[ "${TRAVIS_CPU_ARCH}" == "arm64" ]]; then
-      wget https://anaconda.org/conda-forge/cmake/3.17.0/download/linux-aarch64/cmake-3.17.0-h28c56e5_0.tar.bz2;
-      mkdir $HOME/cmake;
-      tar -xjvf cmake-3.17.0-h28c56e5_0.tar.bz2 -C $HOME/cmake;
-      export PATH=$HOME/cmake/bin:$PATH;
+  - if [[ "${TRAVIS_CPU_ARCH}" == "ppc64le" || "${TRAVIS_CPU_ARCH}" == "arm64" ]]; then
+      sudo apt remove cmake;
+      pushd ${HOME};
+      wget https://github.com/Kitware/CMake/releases/download/v3.17.1/cmake-3.17.1.tar.gz;
+      tar xf cmake-3.17.1.tar.gz;
+      cd cmake-3.17.1;
+      ./bootstrap --prefix=${HOME}/cmake;
+      make -j 4;
+      make install;
+      export PATH=${HOME}/cmake/bin:${PATH};
+      echo ${PATH};
+      popd;
    fi
+  #- if [[ "${TRAVIS_CPU_ARCH}" == "ppc64le" ]]; then
+  #    wget https://anaconda.org/conda-forge/cmake/3.17.0/download/linux-ppc64le/cmake-3.17.0-hfb1cb51_0.tar.bz2;
+  #    mkdir $HOME/cmake;
+  #    tar -xjvf cmake-3.17.0-hfb1cb51_0.tar.bz2 -C $HOME/cmake;
+  #    export PATH=$HOME/cmake/bin:$PATH;
+  #  fi
+  #- if [[ "${TRAVIS_CPU_ARCH}" == "arm64" ]]; then
+  #    wget https://anaconda.org/conda-forge/cmake/3.17.0/download/linux-aarch64/cmake-3.17.0-h28c56e5_0.tar.bz2;
+  #    mkdir $HOME/cmake;
+  #    tar -xjvf cmake-3.17.0-h28c56e5_0.tar.bz2 -C $HOME/cmake;
+  #    export PATH=$HOME/cmake/bin:$PATH;
+  #  fi
  #- if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
  #    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;