Skip to content

Commit 613204b

Browse files
committed
Merge branch 'cb/ci-build-pedantic'
CI update. * cb/ci-build-pedantic: ci: run a pedantic build as part of the GitHub workflow
2 parents 9762646 + cebead1 commit 613204b

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,8 @@ jobs:
259259
image: alpine
260260
- jobname: Linux32
261261
image: daald/ubuntu32:xenial
262+
- jobname: pedantic
263+
image: fedora
262264
env:
263265
jobname: ${{matrix.vector.jobname}}
264266
runs-on: ubuntu-latest

ci/install-docker-dependencies.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,8 @@ linux-musl)
1515
apk add --update build-base curl-dev openssl-dev expat-dev gettext \
1616
pcre2-dev python3 musl-libintl perl-utils ncurses >/dev/null
1717
;;
18+
pedantic)
19+
dnf -yq update >/dev/null &&
20+
dnf -yq install make gcc findutils diffutils perl python3 gettext zlib-devel expat-devel openssl-devel curl-devel pcre2-devel >/dev/null
21+
;;
1822
esac

ci/run-build-and-tests.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ windows*) cmd //c mklink //j t\\.prove "$(cygpath -aw "$cache_dir/.prove")";;
1010
*) ln -s "$cache_dir/.prove" t/.prove;;
1111
esac
1212

13+
if test "$jobname" = "pedantic"
14+
then
15+
export DEVOPTS=pedantic
16+
fi
17+
1318
make
1419
case "$jobname" in
1520
linux-gcc)
@@ -35,10 +40,9 @@ linux-clang)
3540
export GIT_TEST_DEFAULT_HASH=sha256
3641
make test
3742
;;
38-
linux-gcc-4.8)
43+
linux-gcc-4.8|pedantic)
3944
# Don't run the tests; we only care about whether Git can be
40-
# built with GCC 4.8, as it errors out on some undesired (C99)
41-
# constructs that newer compilers seem to quietly accept.
45+
# built with GCC 4.8 or with pedantic
4246
;;
4347
*)
4448
make test

0 commit comments

Comments
 (0)