Fedora 36 is scheduled to be released in Apr 19th, but it includes a prerelease of gcc 12 that has known issues[1] with our codebase and therefore requires extra changes to not break a DEVELOPER=1 build. Lock the CI job to the current release image, and while at it rename the job to better reflect what it is currently doing, instead of its original objective. Finally add git which was a known[2] issue for a while. [1] https://lore.kernel.org/git/YZQhLh2BU5Hquhpo@xxxxxxxxxxxxxxxxxxxxxxx/ [2] https://lore.kernel.org/git/xmqqeeb1dumx.fsf@gitster.g/ Signed-off-by: Carlo Marcelo Arenas Belón <carenas@xxxxxxxxx> --- This merges fine to master, maint and next but will need some work to get into seen. Alternatively, the fixes to fix the build could be merged instead, but it will still require at least one temporary change to disable a flag as the underlying bug[3] is yet to be addressed in gcc (or somewhere else in Fedora). [3] https://bugzilla.redhat.com/show_bug.cgi?id=2075786 .github/workflows/main.yml | 4 ++-- ci/install-docker-dependencies.sh | 4 ++-- ci/run-build-and-tests.sh | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c35200defb9..48e212f4110 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -282,8 +282,8 @@ jobs: - jobname: linux32 os: ubuntu32 image: daald/ubuntu32:xenial - - jobname: pedantic - image: fedora + - jobname: fedora + image: fedora:35 env: jobname: ${{matrix.vector.jobname}} runs-on: ubuntu-latest diff --git a/ci/install-docker-dependencies.sh b/ci/install-docker-dependencies.sh index 78b7e326da6..660e25d1d26 100755 --- a/ci/install-docker-dependencies.sh +++ b/ci/install-docker-dependencies.sh @@ -15,8 +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) +fedora) 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 + dnf -yq install make gcc git 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 280dda7d285..de0f8d36d7c 100755 --- a/ci/run-build-and-tests.sh +++ b/ci/run-build-and-tests.sh @@ -37,10 +37,9 @@ linux-clang) linux-sha256) export GIT_TEST_DEFAULT_HASH=sha256 ;; -pedantic) +fedora) # Don't run the tests; we only care about whether Git can be # built. - export DEVOPTS=pedantic export MAKE_TARGETS=all ;; esac -- 2.36.0.rc2.283.gbef64175c85
