Bump CI image to Fedora 40

Bump IWYU to 0.22 to match the new Clang version. No need to build our own
GLib now that the distro's GLib can generate its own introspection data.

Author: ptomato

test/extra/Dockerfile

@@ -3,7 +3,7 @@
 
 # === Build Spidermonkey stage ===
 
-FROM registry.fedoraproject.org/fedora:39 AS mozjs-build
+FROM registry.fedoraproject.org/fedora:40 AS mozjs-build
 ARG MOZJS_BRANCH=mozjs115
 ARG MOZJS_BUILDDEPS=${MOZJS_BRANCH}
 ARG BUILD_OPTS=
@@ -41,7 +41,7 @@ RUN rm -f /root/mozjs-install/usr/lib64/libjs_static.ajs
 
 # === Actual Docker image ===
 
-FROM registry.fedoraproject.org/fedora:39
+FROM registry.fedoraproject.org/fedora:40
 
 ARG LOCALES=tr_TR
 ENV SHELL=/bin/bash

test/extra/Dockerfile.debug

@@ -3,7 +3,7 @@
 
 # === Build stage ===
 
-FROM registry.fedoraproject.org/fedora:39 AS build
+FROM registry.fedoraproject.org/fedora:40 AS build
 ARG MOZJS_BRANCH=mozjs115
 ARG MOZJS_BUILDDEPS=${MOZJS_BRANCH}
 ARG BUILD_OPTS=
@@ -26,14 +26,14 @@ RUN dnf -y install 'dnf-command(builddep)' \
     rust \
     which \
     xz
-RUN dnf -y builddep ${MOZJS_BUILDDEPS} glib2 gobject-introspection
+RUN dnf -y builddep ${MOZJS_BUILDDEPS} gobject-introspection
 
 WORKDIR /root
 
 RUN mkdir -p include-what-you-use/_build
-ADD https://include-what-you-use.org/downloads/include-what-you-use-0.21.src.tar.gz /root/include-what-you-use/
+ADD https://include-what-you-use.org/downloads/include-what-you-use-0.22.src.tar.gz /root/include-what-you-use/
 WORKDIR /root/include-what-you-use
-RUN tar xzf include-what-you-use-0.21.src.tar.gz --strip-components=1
+RUN tar xzf include-what-you-use-0.22.src.tar.gz --strip-components=1
 
 WORKDIR /root/include-what-you-use/_build
 
@@ -58,32 +58,21 @@ RUN rm -f /root/mozjs-install/usr/lib64/libjs_static.ajs
 
 WORKDIR /root
 
-# Install gnome-introspection from main, so that we can test against it
-# Temporarily, we can only build gobject-introspection with a GLib that's new
-# enough to generate its own GIRs
-RUN git clone https://gitlab.gnome.org/GNOME/glib.git
+# Install gobject-introspection from main, so that we can test against it
 RUN git clone https://gitlab.gnome.org/GNOME/gobject-introspection.git
 
 ENV PATH=/opt/GNOME/bin:$PATH
 ENV LD_LIBRARY_PATH=/opt/GNOME/lib64:$LD_LIBRARY_PATH
 ENV PKG_CONFIG_PATH=/opt/GNOME/lib64/pkgconfig:$PKG_CONFIG_PATH
 
-WORKDIR /root/glib
-RUN meson setup _build . --prefix=/opt/GNOME --buildtype debugoptimized -Dintrospection=disabled
-RUN ninja -C _build install
-
 WORKDIR /root/gobject-introspection
 RUN meson setup _build . --prefix=/opt/GNOME --buildtype debugoptimized -Dbuild_introspection_data=false
 RUN DESTDIR=/root/g-i-install ninja -C _build install
 RUN ninja -C _build install
 
-WORKDIR /root/glib
-RUN meson configure _build -Dintrospection=enabled
-RUN DESTDIR=/root/glib-install ninja -C _build install
-
 # === Actual Docker image ===
 
-FROM registry.fedoraproject.org/fedora:39
+FROM registry.fedoraproject.org/fedora:40
 
 ARG LOCALES=tr_TR
 ENV SHELL=/bin/bash
@@ -142,7 +131,6 @@ RUN dnf -y install --enablerepo=fedora-debuginfo,updates-debuginfo \
 
 COPY --from=build /root/mozjs-install/usr /usr
 COPY --from=build /root/iwyu-install/usr /usr
-COPY --from=build /root/glib-install/opt /opt
 COPY --from=build /root/g-i-install/opt /opt
 RUN ln -s /usr/bin/iwyu_tool.py /usr/bin/iwyu_tool