Skip to content

Commit 3069cf0

Browse files
committed
Try to fix failing travis_wait on linux
1 parent ef978ab commit 3069cf0

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ before_install:
8383

8484
install:
8585
- pwd
86+
- type -a travis_wait
8687
- developer-scripts/travis/install.${TRAVIS_OS_NAME}.sh
8788

8889
script:

developer-scripts/travis/install.linux.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ if [[ "${BUILD_TYPE:-}" != InstallScript ]]; then # Ubuntu on Travis-CI, NOT tes
3131
tar -xzvf "${MPICH_URL_TAIL}" > tar_mpich.log 2>&1 || cat tar_mpich.log
3232
export CC=gcc-${GCC}
3333
export FC=gfortran-${GCC}
34-
(
35-
cd "${MPICH_URL_TAIL%.tar.gz}"
36-
echo "Configuring MPICH ..."
37-
${TRAVIS:+travis_wait} ./configure --prefix="${CACHE}" > configure_mpich.log 2>&1 || cat configure_mpich.log
38-
echo "Building MPICH ..."
39-
${TRAVIS:+travis_wait 30} make -j 4 > make_mpich.log 2>&1 || cat make_mpich.log
40-
echo "Installing MPICH ..."
41-
${TRAVIS:+travis_wait} make install > install_mpich.log 2>&1 || cat install_mpich.log
42-
)
34+
cd "${MPICH_URL_TAIL%.tar.gz}" || exit 4
35+
echo "Configuring MPICH ..."
36+
type -a travis_wait
37+
${TRAVIS:+travis_wait} ./configure --prefix="${CACHE}" > configure_mpich.log 2>&1 || cat configure_mpich.log
38+
echo "Building MPICH ..."
39+
${TRAVIS:+travis_wait 30} make -j 4 > make_mpich.log 2>&1 || cat make_mpich.log
40+
echo "Installing MPICH ..."
41+
${TRAVIS:+travis_wait} make install > install_mpich.log 2>&1 || cat install_mpich.log
42+
cd - || exit 4
4343
fi
4444
fi
4545

0 commit comments

Comments
 (0)