From 0e3988a13110385eb6de94311c64c4530741f86a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 16 Jan 2025 10:23:30 +0100 Subject: [PATCH] CI: Fix creating gi._overridesdir/Modulemd.py symlink E.g. python3-gobject-base-3.40.1-6.el9 in CentOS Stream 9 does not package that directory and thus creating a symlink in it failed. This is not a problem in Fedora 42. --- .ci/archlinux/Dockerfile.deps.tmpl | 2 +- .ci/centos/Dockerfile.deps.tmpl | 2 +- .ci/fedora/get_fedora_deps.sh | 2 +- .ci/mageia/Dockerfile.deps.tmpl | 2 +- .ci/openmandriva/Dockerfile.deps.tmpl | 2 +- .ci/opensuse/Dockerfile.deps.tmpl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci/archlinux/Dockerfile.deps.tmpl b/.ci/archlinux/Dockerfile.deps.tmpl index 48dc730e..1018a8ee 100644 --- a/.ci/archlinux/Dockerfile.deps.tmpl +++ b/.ci/archlinux/Dockerfile.deps.tmpl @@ -15,4 +15,4 @@ RUN pacman -Syu --needed --noconfirm \ python-six \ && pacman -Scc --noconfirm -RUN ln -sf /builddir/bindings/python/gi/overrides/Modulemd.py $(python3 -c "import gi; print(gi._overridesdir)")/Modulemd.py +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/.ci/centos/Dockerfile.deps.tmpl b/.ci/centos/Dockerfile.deps.tmpl index 097e0f53..7ce37385 100644 --- a/.ci/centos/Dockerfile.deps.tmpl +++ b/.ci/centos/Dockerfile.deps.tmpl @@ -51,4 +51,4 @@ ifelse(eval(cosrelease < 8), 1, `dnl sudo \ && yum -y clean all -RUN ln -sf /builddir/bindings/python/gi/overrides/Modulemd.py $(python3 -c "import gi; print(gi._overridesdir)")/Modulemd.py +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/.ci/fedora/get_fedora_deps.sh b/.ci/fedora/get_fedora_deps.sh index 85767904..d8a1d821 100755 --- a/.ci/fedora/get_fedora_deps.sh +++ b/.ci/fedora/get_fedora_deps.sh @@ -55,6 +55,6 @@ dnf -y --setopt=install_weak_deps=False --setopt=tsflags='' \ dnf -y clean all -ln -sf /builddir/bindings/python/gi/overrides/Modulemd.py $(python3 -c "import gi; print(gi._overridesdir)")/Modulemd.py +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 popd diff --git a/.ci/mageia/Dockerfile.deps.tmpl b/.ci/mageia/Dockerfile.deps.tmpl index 508fe578..ca8fe73d 100755 --- a/.ci/mageia/Dockerfile.deps.tmpl +++ b/.ci/mageia/Dockerfile.deps.tmpl @@ -41,4 +41,4 @@ RUN dnf -y --setopt=install_weak_deps=False --setopt=tsflags='' install \ wget \ && dnf -y clean all -RUN ln -sf /builddir/bindings/python/gi/overrides/Modulemd.py $(python3 -c "import gi; print(gi._overridesdir)")/Modulemd.py +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/.ci/openmandriva/Dockerfile.deps.tmpl b/.ci/openmandriva/Dockerfile.deps.tmpl index 23f5d4b3..a5cc19eb 100644 --- a/.ci/openmandriva/Dockerfile.deps.tmpl +++ b/.ci/openmandriva/Dockerfile.deps.tmpl @@ -25,4 +25,4 @@ RUN dnf -y --setopt=install_weak_deps=False --setopt=tsflags='' install \ elinks \ && dnf -y clean all -RUN ln -sf /builddir/bindings/python/gi/overrides/Modulemd.py $(python3 -c "import gi; print(gi._overridesdir)")/Modulemd.py +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/.ci/opensuse/Dockerfile.deps.tmpl b/.ci/opensuse/Dockerfile.deps.tmpl index d6544271..7cc7ba0e 100644 --- a/.ci/opensuse/Dockerfile.deps.tmpl +++ b/.ci/opensuse/Dockerfile.deps.tmpl @@ -34,4 +34,4 @@ RUN zypper install --no-confirm --no-recommends --capability \ sudo \ valgrind -RUN ln -sf /builddir/bindings/python/gi/overrides/Modulemd.py $(python3 -c "import gi; print(gi._overridesdir)")/Modulemd.py +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