File tree Expand file tree Collapse file tree 1 file changed +22
-9
lines changed Expand file tree Collapse file tree 1 file changed +22
-9
lines changed Original file line number Diff line number Diff line change @@ -24,9 +24,10 @@ matrix:
2424 - os : osx
2525 env :
2626 - BUILD_TYPE="InstallScript"
27- OSX_PACKAGES="gcc@6"
27+ OSX_PACKAGES="gcc@6 cmake "
2828 GCC=6
29- - os : osx
29+ - &osx_allowed_failure
30+ os : osx
3031 env :
3132 - OSX_PACKAGES="gcc cmake"
3233 GCC=7
@@ -53,7 +54,6 @@ matrix:
5354 - binutils
5455 - cmake-data
5556 - cmake
56- # - shellcheck
5757 -
5858 << : *ubuntu
5959 env :
@@ -70,7 +70,6 @@ matrix:
7070 - binutils
7171 - cmake-data
7272 - cmake
73- # - shellcheck
7473 -
7574 << : *ubuntu
7675 env :
@@ -85,13 +84,27 @@ matrix:
8584 - gcc-6
8685 - gfortran-6
8786 - g++-6
88- # - shellcheck
89- allow_failures :
90- - os : osx
87+ - &linux_allowed_failure
88+ << : *ubuntu
9189 env :
92- - OSX_PACKAGES="gcc cmake"
93- GCC=7
90+ - GCC=7
9491 OPENCOARRAYS_DEVELOPER=ON
92+ addons :
93+ apt :
94+ sources :
95+ - ubuntu-toolchain-r-test
96+ - george-edison55-precise-backports
97+ packages :
98+ - gcc-7
99+ - gfortran-7
100+ - g++-7
101+ - binutils
102+ - cmake-data
103+ - cmake
104+
105+ allow_failures :
106+ - *osx_allowed_failure
107+ - *linux_allowed_failure
95108
96109before_install :
97110 - export FC=gfortran-${GCC}
You can’t perform that action at this time.
0 commit comments