From 2dea598613d238f451dc98a5819ceac5c536c674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 6 May 2025 12:54:24 +0200 Subject: [PATCH 1/2] CI: Update a list of libmodulemd dependencies pkgconfig(glib-2.0) explicitly probed by meson.build. magic-devel unused since 71ecb126c242f8f3b7c0b0b8192f1321f5d6c227. pkgconfig(zlib) never used. Note that OpenMandriva builds glib2.0 without HTML documentation, thus there is no "gtk-doc"-like package available and therefore libmodulmd cannot build a documention either. --- .ci/openmandriva/Dockerfile.deps.tmpl | 7 +++---- .github/workflows/ci.yaml | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.ci/openmandriva/Dockerfile.deps.tmpl b/.ci/openmandriva/Dockerfile.deps.tmpl index a5cc19eb..4581eb77 100644 --- a/.ci/openmandriva/Dockerfile.deps.tmpl +++ b/.ci/openmandriva/Dockerfile.deps.tmpl @@ -14,13 +14,12 @@ RUN dnf -y --setopt=install_weak_deps=False --setopt=tsflags='' install \ valgrind \ wget \ task-devel \ - 'pkgconfig(zlib)' \ + 'pkgconfig(glib-2.0)' \ 'pkgconfig(gobject-introspection-1.0)' \ + 'pkgconfig(rpm)' \ + 'pkgconfig(yaml-0.1)' \ 'python3dist(autopep8)' \ 'python3dist(pygobject)' \ - 'pkgconfig(yaml-0.1)' \ - 'pkgconfig(rpm)' \ - magic-devel \ git-core \ elinks \ && dnf -y clean all diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 08d443ab..fc958917 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -434,13 +434,12 @@ jobs: valgrind wget task-devel - 'pkgconfig(zlib)' + 'pkgconfig(glib-2.0)' 'pkgconfig(gobject-introspection-1.0)' + 'pkgconfig(yaml-0.1)' 'python3dist(autopep8)' 'python3dist(pygobject)' - 'pkgconfig(yaml-0.1)' 'pkgconfig(rpm)' - magic-devel git-core elinks From 48ab4fc1f02c6354d6dd104465c5e3ec45b309df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 6 May 2025 14:33:53 +0200 Subject: [PATCH 2/2] CI: Do not run "ninja -C ci_scanbuild" on OpenMandriva Default build options need glib2.0 HTML documentation which does not exist there. --- .ci/openmandriva/Dockerfile.deps.tmpl | 1 - .github/workflows/ci.yaml | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.ci/openmandriva/Dockerfile.deps.tmpl b/.ci/openmandriva/Dockerfile.deps.tmpl index 4581eb77..0748a9a6 100644 --- a/.ci/openmandriva/Dockerfile.deps.tmpl +++ b/.ci/openmandriva/Dockerfile.deps.tmpl @@ -21,7 +21,6 @@ RUN dnf -y --setopt=install_weak_deps=False --setopt=tsflags='' install \ 'python3dist(autopep8)' \ 'python3dist(pygobject)' \ git-core \ - elinks \ && dnf -y clean all RUN ln -sf /builddir/bindings/python/gi/overrides/Modulemd.py $(python3 -c "import gi; import os; os.makedirs(gi._overridesdir, exist_ok=True); print(gi._overridesdir)")/Modulemd.py diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fc958917..f0fca5e1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -441,7 +441,6 @@ jobs: 'python3dist(pygobject)' 'pkgconfig(rpm)' git-core - elinks - name: Checkout code uses: actions/checkout@v4 @@ -460,7 +459,8 @@ jobs: - name: Run CI tests run: meson test -C ci --suite ci --print-errorlogs -t 5 - - name: Run clang static analysis tests - run: | - meson setup --buildtype=debug -Dwith_docs=false -Dskip_introspection=true -Dwith_py3=false ci_scanbuild - ninja -C ci_scanbuild scan-build; if [ $? -ne 0 ]; then elinks -dump ci_scanbuild/meson-logs/scanbuild/*/index.html; fi + # Do not run "ninja -C ci_scanbuild" on this platform because glib2.0 + # HTML documentation does not exist and -Dwith_docs=false is needed. + # The internal ci_scanbuild target ignores build options + # and the build would + # fail.