Skip to content

Commit 1c4186d

Browse files
committed
Add Redhat builds
1 parent 8cebf59 commit 1c4186d

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -159,23 +159,32 @@ jobs:
159159
- ubuntu:bionic
160160
- ubuntu:focal
161161
- debian:buster
162-
#- centos:7
163-
#- centos:8
164-
#- fedora:latest
162+
- centos:7
163+
- centos:8
164+
- fedora:latest
165165
cc:
166166
- clang
167167
- gcc
168168
buildsystem:
169169
- autotools
170170
- meson
171171
include:
172+
- with_fortran_autotools: enable
173+
with_fortran_meson: "true"
172174
- cc: clang
173175
cxx: clang++
174176
- cc: gcc
175177
cxx: g++
178+
- os: centos:7
179+
with_fortran_autotools: disable
180+
with_fortran_meson: "false"
176181
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
177184
- image: ubuntu:bionic
178185
buildsystem: meson
186+
- image: centos:7
187+
buildsystem: meson
179188

180189
runs-on: ubuntu-latest
181190
container:
@@ -252,7 +261,7 @@ jobs:
252261
run: |
253262
set -ex
254263
autoreconf -fi
255-
./configure --enable-fortran || (cat config.log && exit 1)
264+
./configure --${{ matrix.with_fortran_autotools }}-fortran || (cat config.log && exit 1)
256265
make
257266
make distcheck
258267
set +ex
@@ -269,7 +278,7 @@ jobs:
269278
cd ${TARBALL%.tar.gz}
270279
mkdir build-meson
271280
cd build-meson
272-
meson --buildtype=debugoptimized -Dwith-fortran=true ..
281+
meson --buildtype=debugoptimized -Dwith-fortran=${{ matrix.with_fortran_meson }} ..
273282
ninja
274283
set +ex
275284
env:
@@ -282,7 +291,7 @@ jobs:
282291
export PATH=${HOME}/.local/bin:${PATH}
283292
mkdir build-tmp
284293
cd build-tmp
285-
meson --buildtype=debugoptimized -Dwith-fortran=true ..
294+
meson --buildtype=debugoptimized -Dwith-fortran=${{ matrix.with_fortran_meson }} ..
286295
ninja
287296
ninja dist
288297
set +ex
@@ -298,7 +307,7 @@ jobs:
298307
tar xfJ $TARBALL
299308
cd ${TARBALL%.tar.xz}
300309
autoreconf -fi
301-
./configure --enable-fortran
310+
./configure --${{ matrix.with_fortran_autotools }}-fortran
302311
make
303312
set +ex
304313
env:

0 commit comments

Comments
 (0)