Use latest stable MPICH & update Homebrew bottles

Author: zbeekman

.travis.yml

@@ -6,12 +6,12 @@ os: osx
 env:
   global:
     - CACHE="${HOME}/.local"
-    - MPICH_VER="3.2"
+    - MPICH_VER="3.2.1"
     - MPICH_URL_HEAD="https://www.mpich.org/static/downloads/${MPICH_VER}"
     - MPICH_URL_TAIL="mpich-${MPICH_VER}.tar.gz"
-    - MPICH_GCC6_BOT_URL_HEAD="https://github.com/sourceryinstitute/OpenCoarrays/files/979804/"
-    - MPICH_GCC7_BOT_URL_HEAD="https://github.com/sourceryinstitute/OpenCoarrays/files/976779/"
-    - MPICH_BOT_URL_TAIL="mpich-3.2_3.yosemite.bottle.1.tar.gz"
+    - MPICH_GCC6_BOT_URL_HEAD="https://github.com/sourceryinstitute/OpenCoarrays/files/1956499/"
+    - MPICH_GCC7_BOT_URL_HEAD="https://github.com/sourceryinstitute/OpenCoarrays/files/1956441/"
+    - MPICH_BOT_URL_TAIL="mpich-3.2.1_1.high_sierra.bottle.1.tar.gz"
     - BUILD_TYPES="Release Debug RelWithDebInfo CodeCoverage"
   matrix:
     - GCC=6 OSX_PACKAGES="gcc@6 shellcheck" BUILD_TYPE="InstallScript"

developer-scripts/travis/install.linux.sh

@@ -25,16 +25,21 @@ if [[ "${BUILD_TYPE:-}" != InstallScript ]]; then # Ubuntu on Travis-CI, NOT tes
     if ! [[ -x "${HOME}/.local/bin/mpif90" && -x "${HOME}/.local/bin/mpicc" ]]; then
         # mpich install not cached
         # could use prerequisites/build instead...
-        wget "${MPICH_URL_HEAD}/${MPICH_URL_TAIL}"
-        tar -xzvf "${MPICH_URL_TAIL}"
-	export CC=gcc-${GCC}
-	export FC=gfortran-${GCC}
+        echo "Downloading MPICH from ${MPICH_URL_HEAD}/${MPICH_URL_TAIL} ..."
+        wget "${MPICH_URL_HEAD}/${MPICH_URL_TAIL}" > wget_mpich.log 2>&1 || cat wget_mpich.log
+        echo "Extracting MPICH ..."
+        tar -xzvf "${MPICH_URL_TAIL}" > tar_mpich.log 2>&1 || cat tar_mpich.log
+        export CC=gcc-${GCC}
+        export FC=gfortran-${GCC}
         (
-	    cd "${MPICH_URL_TAIL%.tar.gz}"
-            ./configure --prefix="${CACHE}"
-            make -j 4
-            make install
-	)
+            cd "${MPICH_URL_TAIL%.tar.gz}"
+            echo "Configuring MPICH ..."
+            ${TRAVIS:+travis_wait} ./configure --prefix="${CACHE}" > configure_mpich.log 2>&1 || cat configure_mpich.log
+            echo "Building MPICH ..."
+            ${TRAVIS:+travis_wait 30} make -j 4 > make_mpich.log 2>&1 || cat make_mpich.log
+            echo "Installing MPICH ..."
+            ${TRAVIS:+travis_wait} make install > install_mpich.log 2>&1 || cat install_mpich.log
+        )
     fi
 fi
 

developer-scripts/travis/test-script.cmake.sh

@@ -33,7 +33,8 @@ for version in ${GCC}; do
 	# but puting it here simplifies the Travis code a lot
 	MPICH_BOT_URL_HEAD=MPICH_GCC${version}_BOT_URL_HEAD
 	brew uninstall --force --ignore-dependencies mpich || true
-	wget "${!MPICH_BOT_URL_HEAD}${MPICH_BOT_URL_TAIL}"
+	echo "Downloading Custom MPICH bottle ${!MPICH_BOT_URL_HEAD}${MPICH_BOT_URL_TAIL} ..."
+	wget "${!MPICH_BOT_URL_HEAD}${MPICH_BOT_URL_TAIL}" > wget_mpichbottle.log 2>&1 || cat wget_mpichbottle.log
 	brew install --force-bottle "${MPICH_BOT_URL_TAIL}"
 	brew ls --versions mpich >/dev/null || brew install --force-bottle mpich
 	rm "${MPICH_BOT_URL_TAIL}"