File tree Expand file tree Collapse file tree 1 file changed +16
-7
lines changed Expand file tree Collapse file tree 1 file changed +16
-7
lines changed Original file line number Diff line number Diff line change @@ -159,23 +159,32 @@ jobs:
159
159
- ubuntu:bionic
160
160
- ubuntu:focal
161
161
- debian:buster
162
- # - centos:7
163
- # - centos:8
164
- # - fedora:latest
162
+ - centos:7
163
+ - centos:8
164
+ - fedora:latest
165
165
cc :
166
166
- clang
167
167
- gcc
168
168
buildsystem :
169
169
- autotools
170
170
- meson
171
171
include :
172
+ - with_fortran_autotools : enable
173
+ with_fortran_meson : " true"
172
174
- cc : clang
173
175
cxx : clang++
174
176
- cc : gcc
175
177
cxx : g++
178
+ - os : centos:7
179
+ with_fortran_autotools : disable
180
+ with_fortran_meson : " false"
176
181
exclude :
182
+ # these builds are excluded as the git they ship is too old to perform a clone,
183
+ # necessary for meson dist to work
177
184
- image : ubuntu:bionic
178
185
buildsystem : meson
186
+ - image : centos:7
187
+ buildsystem : meson
179
188
180
189
runs-on : ubuntu-latest
181
190
container :
@@ -252,7 +261,7 @@ jobs:
252
261
run : |
253
262
set -ex
254
263
autoreconf -fi
255
- ./configure --enable -fortran || (cat config.log && exit 1)
264
+ ./configure --${{ matrix.with_fortran_autotools }} -fortran || (cat config.log && exit 1)
256
265
make
257
266
make distcheck
258
267
set +ex
@@ -269,7 +278,7 @@ jobs:
269
278
cd ${TARBALL%.tar.gz}
270
279
mkdir build-meson
271
280
cd build-meson
272
- meson --buildtype=debugoptimized -Dwith-fortran=true ..
281
+ meson --buildtype=debugoptimized -Dwith-fortran=${{ matrix.with_fortran_meson }} ..
273
282
ninja
274
283
set +ex
275
284
env :
@@ -282,7 +291,7 @@ jobs:
282
291
export PATH=${HOME}/.local/bin:${PATH}
283
292
mkdir build-tmp
284
293
cd build-tmp
285
- meson --buildtype=debugoptimized -Dwith-fortran=true ..
294
+ meson --buildtype=debugoptimized -Dwith-fortran=${{ matrix.with_fortran_meson }} ..
286
295
ninja
287
296
ninja dist
288
297
set +ex
@@ -298,7 +307,7 @@ jobs:
298
307
tar xfJ $TARBALL
299
308
cd ${TARBALL%.tar.xz}
300
309
autoreconf -fi
301
- ./configure --enable -fortran
310
+ ./configure --${{ matrix.with_fortran_autotools }} -fortran
302
311
make
303
312
set +ex
304
313
env :
You can’t perform that action at this time.
0 commit comments