Skip to content

Commit bf2a953

Browse files
committed
Merge pull request #200 from sourceryinstitute/gcc-6-on-travis
Update Travis-CI to use GCC-6 Fixes broken builds due to Homebrew upgrade
2 parents 3118348 + 3259673 commit bf2a953

File tree

1 file changed

+26
-24
lines changed

1 file changed

+26
-24
lines changed

.travis.yml

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ language: generic
33
env:
44
global:
55
- CACHE="$HOME/.local"
6-
- MPICH_VER="3.1.4"
6+
- MPICH_VER="3.2"
77
- MPICH_URL_HEAD="http://www.mpich.org/static/downloads/$MPICH_VER"
88
- MPICH_URL_TAIL="mpich-${MPICH_VER}.tar.gz"
99
- MPICH_DIR="$HOME/.local/usr/mpich"
10-
- MPICH_BOT_URL_HEAD="https://github.com/sourceryinstitute/opencoarrays/files/64308/"
11-
- MPICH_BOT_URL_TAIL="mpich-3.2.yosemite.bottle.1.tar.gz"
10+
- MPICH_BOT_URL_HEAD="https://github.com/sourceryinstitute/opencoarrays/files/303249/"
11+
- MPICH_BOT_URL_TAIL="mpich-3.2_1.yosemite.bottle.1.tar.gz"
1212

1313
matrix:
1414
include:
@@ -37,9 +37,9 @@ matrix:
3737
- george-edison55-precise-backports
3838
- ubuntu-toolchain-r-test
3939
packages:
40-
- gcc-5
41-
- gfortran-5
42-
- g++-5
40+
- gcc-6
41+
- gfortran-6
42+
- g++-6
4343
- binutils
4444
- cmake-data
4545
- cmake
@@ -56,9 +56,9 @@ matrix:
5656
- george-edison55-precise-backports
5757
- ubuntu-toolchain-r-test
5858
packages:
59-
- gcc-5
60-
- gfortran-5
61-
- g++-5
59+
- gcc-6
60+
- gfortran-6
61+
- g++-6
6262
- binutils
6363
- cmake-data
6464
- cmake
@@ -71,9 +71,9 @@ matrix:
7171
sources:
7272
- ubuntu-toolchain-r-test
7373
packages:
74-
- gcc-5
75-
- gfortran-5
76-
- g++-5
74+
- gcc-6
75+
- gfortran-6
76+
- g++-6
7777

7878
before_install:
7979
- |
@@ -84,10 +84,12 @@ before_install:
8484
[[ -d "$CACHE/bin" ]] || mkdir -p "$CACHE/bin"
8585
[[ -d "$MPICH_DIR" ]] || mkdir -p "$MPICH_DIR"
8686
export PATH="$CACHE/bin:$PATH"
87-
export FC=gfortran-5
88-
export CC=gcc-5
87+
export FC=gfortran-6
88+
export CC=gcc-6
89+
export CXX=g++-6
8990
$FC --version
9091
$CC --version
92+
$CXX --version
9193
fi
9294
set +o errexit
9395
@@ -101,8 +103,8 @@ install:
101103
[[ "$(brew ls --versions $pkg)" ]] || brew install --force-bottle $pkg
102104
brew outdated $pkg || brew upgrade --force-bottle $pkg
103105
done
104-
export FC=gfortran-5
105-
export CC=gcc-5
106+
export FC=gfortran-6
107+
export CC=gcc-6
106108
if ! [[ "$(brew ls --versions mpich)" ]] && [[ "X$BUILD_TYPE" != "XInstallScript" ]]; then
107109
wget ${MPICH_BOT_URL_HEAD}${MPICH_BOT_URL_TAIL}
108110
brew install --force-bottle ${MPICH_BOT_URL_TAIL}
@@ -134,7 +136,7 @@ install:
134136
popd
135137
for f in "$MPICH_DIR/bin/"*; do
136138
if [[ -x "$f" ]]; then
137-
ln -fs "$f" "$HOME/.local/bin/${f##*/}" && "${f##*/}" --version
139+
ln -fs "$f" "$HOME/.local/bin/${f##*/}"
138140
fi
139141
done
140142
fi
@@ -150,13 +152,13 @@ script:
150152
- |
151153
set -o errexit
152154
if [[ "X$BUILD_TYPE" = "XInstallScript" ]]; then
153-
export FC=gfortran-5
154-
export CC=gcc-5
155+
export FC=gfortran-6
156+
export CC=gcc-6
155157
[[ -d "$HOME/opt" ]] || mkdir "$HOME/opt"
156158
[[ -d "$HOME/bin" ]] || mkdir "$HOME/bin"
157-
ln -fs "$(which gfortran-5)" "$HOME/bin/gfortran"
158-
ln -fs "$(which gcc-5)" "$HOME/bin/gcc"
159-
ln -fs "$(which g++-5)" "$HOME/bin/g++"
159+
ln -fs "$(which gfortran-6)" "$HOME/bin/gfortran"
160+
ln -fs "$(which gcc-6)" "$HOME/bin/gcc"
161+
ln -fs "$(which g++-6)" "$HOME/bin/g++"
160162
export PATH="$PATH:$HOME/bin"
161163
./install.sh --yes-to-all -i "$HOME/opt/opencoarrays" -j 4 -f "$HOME/bin/gfortran" -c "$HOME/bin/gcc" -C "$HOME/bin/g++"
162164
else
@@ -172,8 +174,8 @@ script:
172174
173175
after_success:
174176
- find . -name '*.gcno' -print
175-
- gcov-5 --version
176-
- bash <(curl -s https://codecov.io/bash) -x $(which gcov-5)
177+
- gcov-6 --version
178+
- bash <(curl -s https://codecov.io/bash) -x $(which gcov-6)
177179

178180
notifications:
179181
webhooks:

0 commit comments

Comments
 (0)