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:
24
24
- os : osx
25
25
env :
26
26
- BUILD_TYPE="InstallScript"
27
- OSX_PACKAGES="gcc@6"
27
+ OSX_PACKAGES="gcc@6 cmake "
28
28
GCC=6
29
- - os : osx
29
+ - &osx_allowed_failure
30
+ os : osx
30
31
env :
31
32
- OSX_PACKAGES="gcc cmake"
32
33
GCC=7
@@ -53,7 +54,6 @@ matrix:
53
54
- binutils
54
55
- cmake-data
55
56
- cmake
56
- # - shellcheck
57
57
-
58
58
<< : *ubuntu
59
59
env :
@@ -70,7 +70,6 @@ matrix:
70
70
- binutils
71
71
- cmake-data
72
72
- cmake
73
- # - shellcheck
74
73
-
75
74
<< : *ubuntu
76
75
env :
@@ -85,13 +84,27 @@ matrix:
85
84
- gcc-6
86
85
- gfortran-6
87
86
- g++-6
88
- # - shellcheck
89
- allow_failures :
90
- - os : osx
87
+ - &linux_allowed_failure
88
+ << : *ubuntu
91
89
env :
92
- - OSX_PACKAGES="gcc cmake"
93
- GCC=7
90
+ - GCC=7
94
91
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
95
108
96
109
before_install :
97
110
- export FC=gfortran-${GCC}
You can’t perform that action at this time.
0 commit comments