Fixes #101: Put Travis-CI code in shell scripts

zbeekman · zbeekman · commit d549043972bc · 2018-01-25T12:23:08.000-05:00
- `after_script` section needs some updating, and install script tests should
   only install cmake etc if they have changed, but this can be fixed later
diff --git a/.travis.yml b/.travis.yml
@@ -13,17 +13,16 @@ env:
     - 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"
     - BUILD_TYPES="Release Debug RelWithDebInfo CodeCoverage"
-  matrix: # shellcheck installed manually below for macOS
-    - GCC=6 OSX_PACKAGES="gcc@6 cmake"
-    - GCC=7 OSX_PACKAGES="gcc cmake"
+  matrix:
+    - GCC="6 7" OSX_PACKAGES="shellcheck gcc gcc@6 cmake"
 
 matrix:
   fast_finish: true
   include:
     - os: osx
       env:
         - BUILD_TYPE="InstallScript"
-          OSX_PACKAGES="gcc@6"
+          OSX_PACKAGES="shellcheck gcc@6"
           GCC=6
     - &ubuntu
       os: linux
@@ -44,8 +43,6 @@ matrix:
             - gcc-6
             - gfortran-6
             - g++-6
-            - binutils
-            - cmake-data
             - cmake
     -
       <<: *ubuntu
@@ -58,8 +55,6 @@ matrix:
             - gcc-7
             - gfortran-7
             - g++-7
-            - binutils
-            - cmake-data
             - cmake
     -
       <<: *ubuntu
@@ -87,37 +82,8 @@ matrix:
     - *linux_allowed_failure
 
 before_install:
-  - export FC=gfortran-${GCC}
-  - export CC=gcc-${GCC}
-  - export CXX=g++-${GCC}
-  - export MPICH_BOT_URL_HEAD=MPICH_GCC${GCC}_BOT_URL_HEAD
-  - |
-    if [[ (-n ${TRAVIS_TAG}) && (${TRAVIS_OS_NAME} == osx) ]] && ${TRAVIS_SECURE_ENV_VARS} ; then
-      brew update > /dev/null
-      brew ls --versions gpg2 >/dev/null || brew install gpg2
-      brew outdated gpg2 || brew upgrade gpg2
-      type -P openssl || brew install openssl
-    fi
-    if ! [[ "${TRAVIS_TAG}" ]] || ! ${TRAVIS_SECURE_ENV_VARS} ; then
-      unset encrypted_ef4535c39461_key || true
-      unset encrypted_ef4535c39461_iv || true
-      rm subkey-328B3A0E-secret.asc{,.enc} || true
-
-    fi
-    if [[ "${TRAVIS_TAG}" ]] ; then
-      curl https://izaakbeekman.com/izaak.pubkey.txt | gpg --import
-      git tag -v ${TRAVIS_TAG}
-    fi
-  - |
-    if [[ (-n ${TRAVIS}) && (${TRAVIS_OS_NAME} == osx) ]]; then
-      export PATH="${PATH}:${HOME}/Library/Python/2.7/bin"
-    else
-      [[ -d "${CACHE}/bin" ]] || mkdir -p "${CACHE}/bin"
-      export PATH="${CACHE}/bin:${PATH}"
-      ${FC} --version
-      ${CC} --version
-      ${CXX} --version
-    fi
+  - source developer-scripts/travis/before_install.all.sh
+  - developer-scripts/travis/before_install.${TRAVIS_OS_NAME}.sh
 
 install:
   - pwd
@@ -129,8 +95,7 @@ script:
 
 after_script:
   - find . -name '*.gcno' -print
-  - gcov-${GCC} --version
-  - bash <(curl -s https://codecov.io/bash) -x $(type -P gcov-${GCC})
+  - for version in ${GCC}; do bash <(curl -s https://codecov.io/bash) -x $(type -P gcov-${GCC}) ; done
   - |
     if [[ "${TRAVIS_TAG}" ]]; then
       if [[ "v${TRAVIS_TAG}" != "v$(sed -n '/[0-9]\{1,\}\(\.[0-9]\{1,\}\)\{1,\}/{s/^\([^.]*\)\([0-9]\{1,\}\(\.[0-9]\{1,\}\)\{1,\}\)\(.*\)/\2/p;q;}' .VERSION)" ]]; then
diff --git a/developer-scripts/travis/before_install.all.sh b/developer-scripts/travis/before_install.all.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+if ! [[ "${TRAVIS_TAG}" ]] || ! ${TRAVIS_SECURE_ENV_VARS} ; then
+    unset encrypted_ef4535c39461_key || true
+    unset encrypted_ef4535c39461_iv || true
+    rm subkey-328B3A0E-secret.asc{,.enc} || true
+else
+    echo "Encrypted vars not unset"
+fi
+if [[ "${OS_TYPE}" == [Dd]arwin* ]]; then
+    export PATH="${PATH}:${HOME}/Library/Python/2.7/bin"
+else
+    export PATH="${CACHE}/bin:${PATH}"
+    export FC=gfortran-${GCC}
+    export CC=gcc-${GCC}
+    export CXX=g++-${GCC}
+fi
diff --git a/developer-scripts/travis/before_install.linux.sh b/developer-scripts/travis/before_install.linux.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o verbose
+set -o pipefail
+set -o nounset
+set -o errtrace
+
+__file=developer-scripts/travis/install.linux.sh
+
+# Error tracing
+# requires `set -o errtrace`
+__caf_err_report() {
+    error_code=${?}
+    local error_code
+    echo "Error (code=${error_code}) in ${__file} in function ${1} on line ${2}." >&2
+    false
+    return ${error_code}
+}
+# Always provide an error backtrace
+trap '__caf_err_report "${FUNCNAME:-.}" ${LINENO}' ERR
+
+[[ -d "${CACHE}/bin" ]] || mkdir -p "${CACHE}/bin"
+${FC} --version
+${CC} --version
+${CXX} --version
diff --git a/developer-scripts/travis/before_install.osx.sh b/developer-scripts/travis/before_install.osx.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o verbose
+set -o pipefail
+set -o nounset
+set -o errtrace
+
+__file=developer-scripts/travis/install.linux.sh
+
+# Error tracing
+# requires `set -o errtrace`
+__caf_err_report() {
+    error_code=${?}
+    local error_code
+    echo "Error (code=${error_code}) in ${__file} in function ${1} on line ${2}." >&2
+    false
+    return ${error_code}
+}
+# Always provide an error backtrace
+trap '__caf_err_report "${FUNCNAME:-.}" ${LINENO}' ERR
+
+if [[ -n "${TRAVIS_TAG}" ]] && ${TRAVIS_SECURE_ENV_VARS} ; then
+    brew update > /dev/null
+    brew ls --versions gpg2 >/dev/null || brew install gpg2
+    brew outdated gpg2 || brew upgrade gpg2
+    type -P openssl || brew install openssl
+    curl https://izaakbeekman.com/izaak.pubkey.txt | gpg --import
+    git tag -v "${TRAVIS_TAG}"
+fi
+gfortran --version
+gcc --version
+g++ --version
diff --git a/developer-scripts/travis/install.linux.sh b/developer-scripts/travis/install.linux.sh
@@ -28,6 +28,8 @@ if [[ "${BUILD_TYPE:-}" != InstallScript ]]; then # Ubuntu on Travis-CI, NOT tes
         # 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}
         (
 	    cd "${MPICH_URL_TAIL%.tar.gz}"
             ./configure --prefix="${CACHE}"
diff --git a/developer-scripts/travis/install.osx.sh b/developer-scripts/travis/install.osx.sh
@@ -25,20 +25,17 @@ echo "Performing Travis-CI installation phase on macOS..."
 # Update and install via Homebrew on macOS
 brew update > /dev/null
 
-brew ls --versions shellcheck >/dev/null || brew install --force-bottle shellcheck
-brew outdated shellcheck || brew upgrade --force-bottle shellcheck
 for pkg in ${OSX_PACKAGES}; do
-    brew ls --versions "${pkg}" >/dev/null || brew install "${pkg}" || brew link --overwrite "${pkg}"
-    brew outdated "${pkg}" || brew upgrade "${pkg}"
+    brew ls --versions "${pkg}" >/dev/null || brew install --force-bottle "${pkg}" || brew link --overwrite "${pkg}"
+    brew outdated "${pkg}" || brew upgrade --force-bottle "${pkg}"
 done
+
+# Uninstall mpich and openmpi so that we can install our own version
+brew uninstall --force --ignore-dependencies openmpi || true
+brew uninstall --force --ignore-dependencies mpich || true
+
 if [[ "${BUILD_TYPE:-}" == InstallScript ]]; then # uninstall some stuff if present
     brew uninstall --force --ignore-dependencies cmake || true
-    brew uninstall --force --ignore-dependencies mpich || true
-    brew uninstall --force --ignore-dependencies openmpi || true
-else
-    wget "${!MPICH_BOT_URL_HEAD}${MPICH_BOT_URL_TAIL}"
-    brew install --force-bottle "${MPICH_BOT_URL_TAIL}"
-    brew ls --versions mpich >/dev/null || brew install --force-bottle mpich
 fi
 
 {
diff --git a/developer-scripts/travis/test-script.InstallScript.sh b/developer-scripts/travis/test-script.InstallScript.sh
@@ -21,7 +21,8 @@ __caf_err_report() {
 trap '__caf_err_report "${FUNCNAME:-.}" ${LINENO}' ERR
 
 echo "Performing Travis-CI script phase for the OpenCoarrays installation script..."
-
+export FC=gfortran-${GCC}
+export CC=gcc-${GCC}
 ./install.sh --yes-to-all -i "${HOME}/opencoarrays" -j 4 -f "$(type -P "${FC}")" -c "$(type -P "${CC}")" -C "$(type -P "${CXX}")"
 BUILD_LOC=(prerequisites/builds/opencoarrays/*/)
 BUILD_LOC_DIR="${BUILD_LOC[${#BUILD_LOC[@]}-1]}"
diff --git a/developer-scripts/travis/test-script.cmake.sh b/developer-scripts/travis/test-script.cmake.sh
@@ -23,17 +23,36 @@ trap '__caf_err_report "${FUNCNAME:-.}" ${LINENO}' ERR
 echo "Performing Travis-CI script phase for the OpenCoarrays direct cmake build..."
 
 mkdir cmake-build
-# shellcheck disable=SC2153
-for BUILD_TYPE in ${BUILD_TYPES}; do
-    rm -rf cmake-build/* || true
-    (
-	cd cmake-build
-	cmake -DCMAKE_INSTALL_PREFIX:PATH="${HOME}/OpenCoarrays" -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" ..
-	make -j 4
-	ctest --output-on-failure --schedule-random --repeat-until-fail "${NREPEAT:-5}" --timeout "${TEST_TIMEOUT:-200}"
-	make install
-	make uninstall
-    )
-done
 
+for version in ${GCC}; do
+    export FC=gfortran-${version}
+    export CC=gcc-${version}
+    ${FC} --version
+    ${CC} --verions
+    if [[ ${OS_TYPE} == [Dd]arwin* ]]; then
+	# Ideally this stuff would be in the `install:` section
+	# 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}"
+	brew install --force-bottle "${MPICH_BOT_URL_TAIL}"
+	brew ls --versions mpich >/dev/null || brew install --force-bottle mpich
+	rm "${MPICH_BOT_URL_TAIL}"
+    fi
+    mpif90 --version && mpif90 -show
+    mpicc --version && mpicc -show
+
+    # shellcheck disable=SC2153
+    for BUILD_TYPE in ${BUILD_TYPES}; do
+	rm -rf cmake-build/* || true
+	(
+	    cd cmake-build
+	    cmake -DCMAKE_INSTALL_PREFIX:PATH="${HOME}/OpenCoarrays" -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" ..
+	    make -j 4
+	    ctest --output-on-failure --schedule-random --repeat-until-fail "${NREPEAT:-5}" --timeout "${TEST_TIMEOUT:-200}"
+	    make install
+	    make uninstall
+	)
+    done
+done
 echo "Done."

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@ if [[ "${BUILD_TYPE:-}" != InstallScript ]]; then # Ubuntu on Travis-CI, NOT tes`
`28`	`28`	`# could use prerequisites/build instead...`
`29`	`29`	`wget "${MPICH_URL_HEAD}/${MPICH_URL_TAIL}"`
`30`	`30`	`tar -xzvf "${MPICH_URL_TAIL}"`
	`31`	`+ export CC=gcc-${GCC}`
	`32`	`+ export FC=gfortran-${GCC}`
`31`	`33`	`(`
`32`	`34`	`cd "${MPICH_URL_TAIL%.tar.gz}"`
`33`	`35`	`./configure --prefix="${CACHE}"`