File tree Expand file tree Collapse file tree 2 files changed +19
-23
lines changed
Expand file tree Collapse file tree 2 files changed +19
-23
lines changed Original file line number Diff line number Diff line change 11image :
22- Visual Studio 2017
3- # - Ubuntu too old CMake 3.5
3+ - Ubuntu
44
55environment :
66 MINGW_DIR : C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin
@@ -11,11 +11,10 @@ build: off
1111
1212init :
1313- cmd : set PATH=%MINGW_DIR%;%PATH%
14- - cmd : set FC=%MINGW_DIR%\gfortran
1514
1615- sh : sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test" > /dev/null
1716- sh : sudo apt-get -yq update > /dev/null
18- - sh : sudo apt-get install -yq --no-install-suggests --no-install-recommends gfortran-6 cmake make > /dev/null
17+ - sh : sudo apt-get install -yq --no-install-suggests --no-install-recommends gfortran-6 > /dev/null
1918- sh : export FC=/usr/bin/gfortran-6
2019
2120install :
@@ -24,7 +23,6 @@ install:
2423- sh : cmake ..
2524
2625- cmake --build .
27-
28- test_script :
29- - ctest -V
26+
27+ test_script : ctest -V
3028
Original file line number Diff line number Diff line change 77 quiet : true
88
99os :
10- - linux
11- - osx
10+ - linux
11+ - osx
1212
1313env : FC=gfortran-6
1414
1515addons :
1616 apt :
1717 sources :
18- - ubuntu-toolchain-r-test
18+ - ubuntu-toolchain-r-test
1919 packages :
20- - gfortran-6
21- - gcc-6
20+ - gfortran-6
21+ - gcc-6
2222# 'libopenmpi-dev' # wrong version mpi
2323 # - libhdf5-dev # old version
2424 # - libnetcdf-dev
2525# - libnetcdff-dev # not in image repos
2626
2727before_install :
28- - if [[ $TRAVIS_OS_NAME == osx ]]; then
29- brew update > /dev/null;
30- brew install gcc > /dev/null || brew link --overwrite gcc > /dev/null;
31- export FC=gfortran;
32- brew install hdf5 netcdf > /dev/null;
33- fi
28+ - if [[ $TRAVIS_OS_NAME == osx ]]; then
29+ brew update > /dev/null;
30+ brew install gcc > /dev/null || brew link --overwrite gcc > /dev/null;
31+ export FC=gfortran;
32+ brew install hdf5 netcdf > /dev/null;
33+ fi
3434# takes 15 minutes to setup on Travis for Linux.
3535# - if [[ $TRAVIS_OS_NAME == linux ]]; then
3636# export HOMEBREW_FORCE_VENDOR_RUBY=1;
@@ -41,11 +41,9 @@ before_install:
4141
4242
4343install :
44- - cd bin
45- - cmake ..
46- - cmake --build .
47-
48- script :
49- - ctest -V
44+ - cd bin
45+ - cmake ..
46+ - cmake --build .
5047
48+ script : ctest -V
5149
You can’t perform that action at this time.
0 commit comments