Merge branch 'wip/pwithnall/ci-image-updates' into 'main'

ci: Update CI images to add gdb and pcre2

See merge request GNOME/glib!2782

.gitlab-ci.yml

@@ -10,10 +10,10 @@ cache:
     - _ccache/
 
 variables:
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v16"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v17"
-  COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v5"
+  COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v6"
-  DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v11"
+  DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v12"
-  MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v7"
+  MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v8"
   MESON_TEST_TIMEOUT_MULTIPLIER: 2
   G_MESSAGES_DEBUG: all
   MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --fatal-meson-warnings"

.gitlab-ci/coverity.Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.gitlab.gnome.org/gnome/glib/fedora:v16
+FROM registry.gitlab.gnome.org/gnome/glib/fedora:v17
 
 ARG COVERITY_SCAN_PROJECT_NAME
 ARG COVERITY_SCAN_TOKEN

.gitlab-ci/debian-stable.Dockerfile

@@ -13,6 +13,7 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \
     flake8 \
     fuse \
     gcc \
+    gdb \
     g++ \
     gettext \
     git \
@@ -26,6 +27,7 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \
     libffi-dev \
     libmount-dev \
     libpcre3-dev \
+    libpcre2-dev \
     libselinux1-dev \
     libxml2-utils \
     libxslt1-dev \

.gitlab-ci/fedora.Dockerfile

@@ -13,6 +13,7 @@ RUN dnf -y update \
     fuse \
     gcc \
     gcc-c++ \
+    gdb \
     gettext \
     git \
     glibc-devel \
@@ -43,6 +44,7 @@ RUN dnf -y update \
     ncurses-compat-libs \
     ninja-build \
     pcre-devel \
+    pcre2-devel \
     "python3-dbusmock >= 0.18.3-2" \
     python3-pip \
     python3-pygments \

.gitlab-ci/mingw.Dockerfile

@@ -44,6 +44,7 @@ RUN dnf -y install \
     ncurses-compat-libs \
     ninja-build \
     pcre-devel \
+    pcre2-devel \
     python3 \
     python3-pip \
     python3-wheel \

.gitlab-ci/test-msys2.sh

@@ -19,6 +19,7 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-libffi \
     mingw-w64-$MSYS2_ARCH-meson \
     mingw-w64-$MSYS2_ARCH-pcre \
+    mingw-w64-$MSYS2_ARCH-pcre2 \
     mingw-w64-$MSYS2_ARCH-python3 \
     mingw-w64-$MSYS2_ARCH-python-pip \
     mingw-w64-$MSYS2_ARCH-toolchain \

subprojects/pcre2.wrap

@@ -0,0 +1,16 @@
+[wrap-file]
+directory = pcre2-10.40
+source_url = https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.40/pcre2-10.40.tar.bz2
+source_filename = pcre2-10.40.tar.bz2
+source_hash = 14e4b83c4783933dc17e964318e6324f7cae1bc75d8f3c79bc6969f00c159d68
+patch_filename = pcre2_10.40-2_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/pcre2_10.40-2/get_patch
+patch_hash = 6c1bbb3c00ec3917b3abee922dedc19ad8b3a199db65ba893a61241e3428bdbd
+wrapdb_version = 10.40-2
+
+[provide]
+libpcre2-8 = -libpcre2_8
+libpcre2-16 = -libpcre2_16
+libpcre2-32 = -libpcre2_32
+libpcre2-posix = -libpcre2_posix
+