Skip to content

Commit 23c5d3c

Browse files
committed
Fix install.linux.sh travis_wait issue
1 parent 9e6f2cb commit 23c5d3c

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.travis.yml

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

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

8988
script:
9089
- pwd

developer-scripts/travis/install.linux.sh

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,16 @@ 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-
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
34+
(
35+
cd "${MPICH_URL_TAIL%.tar.gz}" || exit 4
36+
echo "Configuring MPICH ..."
37+
pwd
38+
./configure --prefix="${CACHE}"
39+
echo "Building MPICH ..."
40+
make -j 4
41+
echo "Installing MPICH ..."
42+
make install
43+
)
4344
fi
4445
fi
4546

0 commit comments

Comments
 (0)