From f1005e635c63405c0eebd6398dba699e448f92eb Mon Sep 17 00:00:00 2001 From: Victor Toso Date: Tue, 8 Mar 2022 10:07:45 +0100 Subject: ci: refresh generated files * Adds EPEL to centos-stream-9 * Adds cppi dependency to Fedora and Opensuse * Some cosmetic changes Signed-off-by: Victor Toso --- ci/containers/centos-stream-9.Dockerfile | 3 +++ ci/containers/debian-10.Dockerfile | 3 +-- ci/containers/fedora-34.Dockerfile | 1 + ci/containers/fedora-35.Dockerfile | 1 + ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 15 ++++++++------- ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 15 ++++++++------- ci/containers/fedora-rawhide.Dockerfile | 3 ++- ci/containers/opensuse-leap-152.Dockerfile | 4 ++-- ci/containers/opensuse-tumbleweed.Dockerfile | 3 ++- ci/containers/ubuntu-1804.Dockerfile | 3 +-- ci/containers/ubuntu-2004.Dockerfile | 3 +-- ci/gitlab.yml | 4 ++-- 12 files changed, 32 insertions(+), 26 deletions(-) diff --git a/ci/containers/centos-stream-9.Dockerfile b/ci/containers/centos-stream-9.Dockerfile index 7914630..341b6c9 100644 --- a/ci/containers/centos-stream-9.Dockerfile +++ b/ci/containers/centos-stream-9.Dockerfile @@ -9,6 +9,9 @@ FROM quay.io/centos/centos:stream9 RUN dnf update -y && \ dnf install 'dnf-command(config-manager)' -y && \ dnf config-manager --set-enabled -y crb && \ + dnf install -y \ + https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm \ + https://dl.fedoraproject.org/pub/epel/epel-next-release-latest-9.noarch.rpm && \ dnf install -y \ ca-certificates \ check-devel \ diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile index 192456c..236d428 100644 --- a/ci/containers/debian-10.Dockerfile +++ b/ci/containers/debian-10.Dockerfile @@ -49,8 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN pip3 install \ - meson==0.56.0 +RUN pip3 install meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/fedora-34.Dockerfile b/ci/containers/fedora-34.Dockerfile index 5d97b3e..1490bf5 100644 --- a/ci/containers/fedora-34.Dockerfile +++ b/ci/containers/fedora-34.Dockerfile @@ -21,6 +21,7 @@ exec "$@"' > /usr/bin/nosync && \ ca-certificates \ ccache \ check-devel \ + cppi \ gcc \ gettext \ git \ diff --git a/ci/containers/fedora-35.Dockerfile b/ci/containers/fedora-35.Dockerfile index fccabd7..1fb5ace 100644 --- a/ci/containers/fedora-35.Dockerfile +++ b/ci/containers/fedora-35.Dockerfile @@ -21,6 +21,7 @@ exec "$@"' > /usr/bin/nosync && \ ca-certificates \ ccache \ check-devel \ + cppi \ gcc \ gettext \ git \ diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile index 9b1db4d..06b1c26 100644 --- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile @@ -17,11 +17,12 @@ else\n\ fi\n\ exec "$@"' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ - nosync dnf update -y && \ + nosync dnf distro-sync -y && \ nosync dnf install -y \ ca-certificates \ ccache \ check-devel \ + cppi \ git \ glibc-langpack-en \ gtk-doc \ @@ -42,6 +43,12 @@ exec "$@"' > /usr/bin/nosync && \ nosync dnf autoremove -y && \ nosync dnf clean all -y +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN nosync dnf install -y \ mingw32-gcc \ mingw32-gettext \ @@ -56,11 +63,5 @@ RUN nosync dnf install -y \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "i686-w64-mingw32" ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw32.meson" diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile index bf32a56..08781d3 100644 --- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile @@ -17,11 +17,12 @@ else\n\ fi\n\ exec "$@"' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ - nosync dnf update -y && \ + nosync dnf distro-sync -y && \ nosync dnf install -y \ ca-certificates \ ccache \ check-devel \ + cppi \ git \ glibc-langpack-en \ gtk-doc \ @@ -42,6 +43,12 @@ exec "$@"' > /usr/bin/nosync && \ nosync dnf autoremove -y && \ nosync dnf clean all -y +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN nosync dnf install -y \ mingw64-gcc \ mingw64-gettext \ @@ -56,11 +63,5 @@ RUN nosync dnf install -y \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "x86_64-w64-mingw32" ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw64.meson" diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile index 3cab96e..6de0847 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -17,11 +17,12 @@ else\n\ fi\n\ exec "$@"' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ - nosync dnf update -y && \ + nosync dnf distro-sync -y && \ nosync dnf install -y \ ca-certificates \ ccache \ check-devel \ + cppi \ gcc \ gettext \ git \ diff --git a/ci/containers/opensuse-leap-152.Dockerfile b/ci/containers/opensuse-leap-152.Dockerfile index a72c2e1..ac77203 100644 --- a/ci/containers/opensuse-leap-152.Dockerfile +++ b/ci/containers/opensuse-leap-152.Dockerfile @@ -11,6 +11,7 @@ RUN zypper update -y && \ ca-certificates \ ccache \ check-devel \ + cppi \ gcc \ gettext-runtime \ git \ @@ -44,8 +45,7 @@ RUN zypper update -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN pip3 install \ - meson==0.56.0 +RUN pip3 install meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile b/ci/containers/opensuse-tumbleweed.Dockerfile index ad67dad..95565bf 100644 --- a/ci/containers/opensuse-tumbleweed.Dockerfile +++ b/ci/containers/opensuse-tumbleweed.Dockerfile @@ -6,11 +6,12 @@ FROM registry.opensuse.org/opensuse/tumbleweed:latest -RUN zypper update -y && \ +RUN zypper dist-upgrade -y && \ zypper install -y \ ca-certificates \ ccache \ check-devel \ + cppi \ gcc \ gettext-runtime \ git \ diff --git a/ci/containers/ubuntu-1804.Dockerfile b/ci/containers/ubuntu-1804.Dockerfile index 923e959..1e0b8d2 100644 --- a/ci/containers/ubuntu-1804.Dockerfile +++ b/ci/containers/ubuntu-1804.Dockerfile @@ -49,8 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN pip3 install \ - meson==0.56.0 +RUN pip3 install meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile index 2414e3e..511d923 100644 --- a/ci/containers/ubuntu-2004.Dockerfile +++ b/ci/containers/ubuntu-2004.Dockerfile @@ -49,8 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN pip3 install \ - meson==0.56.0 +RUN pip3 install meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/gitlab.yml b/ci/gitlab.yml index 7110872..33a9fc8 100644 --- a/ci/gitlab.yml +++ b/ci/gitlab.yml @@ -271,8 +271,8 @@ mingw32-fedora-rawhide: - mingw32-fedora-rawhide-container allow_failure: false variables: - NAME: fedora-rawhide CROSS: mingw32 + NAME: fedora-rawhide mingw64-fedora-rawhide: @@ -281,5 +281,5 @@ mingw64-fedora-rawhide: - mingw64-fedora-rawhide-container allow_failure: false variables: - NAME: fedora-rawhide CROSS: mingw64 + NAME: fedora-rawhide -- cgit v1.2.1