Skip to content

Commit 5fdb2bf

Browse files
committed
how about this
1 parent 5e08b7a commit 5fdb2bf

File tree

1 file changed

+18
-16
lines changed

1 file changed

+18
-16
lines changed

.travis.yml

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ matrix:
2828
- cmake
2929
- python-pip
3030
env:
31-
- FC=gfortran-6
31+
- GFORTRAN=gfortran-6
32+
- GCOV=gcov-6
3233
# CMake build with unit tests, no documentation, with coverage analysis
3334
# No unicode so that coverage combined with the build script will cover unicode
3435
# and non-unicode code paths
@@ -48,7 +49,7 @@ matrix:
4849
- python-pip
4950
- graphviz
5051
env:
51-
- FC=gfortran-6
52+
- GFORTRAN=gfortran-6
5253
- GCOV=gcov-6
5354
# build with build.sh, make documentation, run unit tests
5455
# and perform coverage analysis
@@ -67,7 +68,8 @@ matrix:
6768
- binutils
6869
- python-pip
6970
env:
70-
- FC=gfortran-7
71+
- GFORTRAN=gfortran-7
72+
- GCOV=gcov-7
7173
# build with build.sh, run unit tests
7274
- BUILD_SCRIPT="./build.sh --skip-documentation && ./build.sh --skip-documentation --enable-unicode"
7375
- CODE_COVERAGE="no"
@@ -84,7 +86,8 @@ matrix:
8486
- binutils
8587
- python-pip
8688
env:
87-
- FC=gfortran-8
89+
- GFORTRAN=gfortran-8
90+
- GCOV=gcov-8
8891
# build with build.sh, run unit tests
8992
- BUILD_SCRIPT="./build.sh --skip-documentation && ./build.sh --skip-documentation --enable-unicode"
9093
- CODE_COVERAGE="no"
@@ -101,24 +104,23 @@ matrix:
101104
- binutils
102105
- python-pip
103106
env:
104-
- FC=gfortran-9
107+
- GFORTRAN=gfortran-9
108+
- GCOV=gcov-9
105109
# build with build.sh, run unit tests
106110
- BUILD_SCRIPT="./build.sh --skip-documentation && ./build.sh --skip-documentation --enable-unicode"
107111
- CODE_COVERAGE="no"
108112
- DEPLOY_DOCUMENTATION="no"
109113

110114
install:
111-
# - |
112-
# if [[ ! -d "$HOME/.local/bin" ]]; then
113-
# mkdir "$HOME/.local/bin"
114-
# fi
115-
# - export PATH="$HOME/.local/bin:$PATH"
116-
# - export FC=/usr/bin/gfortran-6
117-
# - ln -fs /usr/bin/gfortran-6 "$HOME/.local/bin/gfortran" && gfortran --version
118-
# - ls -l /usr/bin/gfortran-6
119-
# - ln -fs /usr/bin/gcov-6 "$HOME/.local/bin/gcov" && gcov --version
120-
- gcov --version
121-
- gfortran --version
115+
- |
116+
if [[ ! -d "$HOME/.local/bin" ]]; then
117+
mkdir "$HOME/.local/bin"
118+
fi
119+
- export PATH="$HOME/.local/bin:$PATH"
120+
- export FC=/usr/bin/$GFORTRAN
121+
- ln -fs $FC "$HOME/.local/bin/gfortran" && gfortran --version
122+
- ls -l $FC
123+
- ln -fs /usr/bin/$GCOV "$HOME/.local/bin/gcov" && gcov --version
122124
- perl --version
123125
- pip install --upgrade pygooglechart
124126
- pip install --upgrade graphviz

0 commit comments

Comments
 (0)