diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:31 -0700 |
| commit | 7bdcb8ef1f8a6deb78adfeaf67b8dd1e9c7e4ff0 (patch) | |
| tree | d44d408a4ee7ef567bb42b537a132e0d84be401d /ci | |
| parent | Merge branch 'rs/archive-use-object-id' into maint (diff) | |
| parent | ci: run a pedantic build as part of the GitHub workflow (diff) | |
| download | tgif-7bdcb8ef1f8a6deb78adfeaf67b8dd1e9c7e4ff0.tar.xz | |
Merge branch 'cb/ci-build-pedantic' into maint
CI update.
* cb/ci-build-pedantic:
ci: run a pedantic build as part of the GitHub workflow
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/install-docker-dependencies.sh | 4 | ||||
| -rwxr-xr-x | ci/run-build-and-tests.sh | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/ci/install-docker-dependencies.sh b/ci/install-docker-dependencies.sh index 26a6689766..07a8c6b199 100755 --- a/ci/install-docker-dependencies.sh +++ b/ci/install-docker-dependencies.sh @@ -15,4 +15,8 @@ linux-musl) apk add --update build-base curl-dev openssl-dev expat-dev gettext \ pcre2-dev python3 musl-libintl perl-utils ncurses >/dev/null ;; +pedantic) + dnf -yq update >/dev/null && + dnf -yq install make gcc findutils diffutils perl python3 gettext zlib-devel expat-devel openssl-devel curl-devel pcre2-devel >/dev/null + ;; esac diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh index 3ce81ffee9..f3aba5d6cb 100755 --- a/ci/run-build-and-tests.sh +++ b/ci/run-build-and-tests.sh @@ -10,6 +10,11 @@ windows*) cmd //c mklink //j t\\.prove "$(cygpath -aw "$cache_dir/.prove")";; *) ln -s "$cache_dir/.prove" t/.prove;; esac +if test "$jobname" = "pedantic" +then + export DEVOPTS=pedantic +fi + make case "$jobname" in linux-gcc) @@ -35,10 +40,9 @@ linux-clang) export GIT_TEST_DEFAULT_HASH=sha256 make test ;; -linux-gcc-4.8) +linux-gcc-4.8|pedantic) # Don't run the tests; we only care about whether Git can be - # built with GCC 4.8, as it errors out on some undesired (C99) - # constructs that newer compilers seem to quietly accept. + # built with GCC 4.8 or with pedantic ;; *) make test |