diff --git a/.ci/openmandriva/Dockerfile.deps.tmpl b/.ci/openmandriva/Dockerfile.deps.tmpl index a5cc19eb..0748a9a6 100644 --- a/.ci/openmandriva/Dockerfile.deps.tmpl +++ b/.ci/openmandriva/Dockerfile.deps.tmpl @@ -14,15 +14,13 @@ 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 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 08d443ab..f0fca5e1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -434,15 +434,13 @@ 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 - name: Checkout code uses: actions/checkout@v4 @@ -461,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.