[gjs: 2/3] CI: Upgrade mozjs78 images to Fedora 33

[Philip Chimento <pchimento src gnome org>]

commit 1b61043b4756d300db4a833a621bd3eab462c288
Author: Philip Chimento <philip chimento gmail com>
Date:   Mon Nov 23 10:44:42 2020 -0800

    CI: Upgrade mozjs78 images to Fedora 33
    
    Allows us to move back to the distro's latest version of Meson, which no
    longer has the bug that considers skipped tests as failed. Also upgrades
    IWYU to 0.15, the version that goes along with Clang 11.

 test/extra/Dockerfile       | 10 +++++-----
 test/extra/Dockerfile.debug | 15 ++++++++-------
 2 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/test/extra/Dockerfile b/test/extra/Dockerfile
index 8da6c469..18479b25 100644
--- a/test/extra/Dockerfile
+++ b/test/extra/Dockerfile
@@ -2,7 +2,7 @@
 
 # === Build Spidermonkey stage ===
 
-FROM registry.fedoraproject.org/fedora:32 AS mozjs-build
+FROM registry.fedoraproject.org/fedora:33 AS mozjs-build
 ARG MOZJS_BRANCH=mozjs78
 ARG MOZJS_BUILDDEPS=${MOZJS_BRANCH}
 ARG BUILD_OPTS=
@@ -27,7 +27,7 @@ RUN rm -f /root/mozjs-install/usr/lib64/libjs_static.ajs
 
 # === Actual Docker image ===
 
-FROM registry.fedoraproject.org/fedora:32
+FROM registry.fedoraproject.org/fedora:33
 
 ENV SHELL=/bin/bash
 
@@ -38,14 +38,14 @@ ENV SHELL=/bin/bash
 # final Docker image.
 RUN dnf -y install --enablerepo=fedora-debuginfo,updates-debuginfo \
     binutils cairo-debuginfo cairo-debugsource cairo-gobject-devel clang \
-    compiler-rt dbus-daemon diffutils fontconfig-debuginfo \
+    compiler-rt dbus-daemon dbus-x11 diffutils fontconfig-debuginfo \
     fontconfig-debugsource gcc-c++ git glib2-debuginfo glib2-debugsource \
     glib2-devel glibc-debuginfo glibc-debuginfo-common gnome-desktop-testing \
     gobject-introspection-debuginfo gobject-introspection-debugsource \
     gobject-introspection-devel gtk3-debuginfo gtk3-debugsource gtk3-devel \
     gtk4-debuginfo gtk4-debugsource gtk4-devel lcov libasan libubsan libtsan \
-    meson-0.54.0-1.fc32 ninja-build pkgconf readline-devel systemtap-sdt-devel \
-    valgrind which Xvfb xz && \
+    meson ninja-build pkgconf readline-devel systemtap-sdt-devel valgrind \
+    which Xvfb xz && \
     dnf clean all && rm -rf /var/cache/dnf
 
 COPY --from=mozjs-build /root/mozjs-install/usr /usr
diff --git a/test/extra/Dockerfile.debug b/test/extra/Dockerfile.debug
index c87445c5..5b0c8dc6 100644
--- a/test/extra/Dockerfile.debug
+++ b/test/extra/Dockerfile.debug
@@ -2,7 +2,7 @@
 
 # === Build stage ===
 
-FROM registry.fedoraproject.org/fedora:32 AS build
+FROM registry.fedoraproject.org/fedora:33 AS build
 ARG MOZJS_BRANCH=mozjs78
 ARG MOZJS_BUILDDEPS=${MOZJS_BRANCH}
 ARG BUILD_OPTS=
@@ -15,9 +15,10 @@ RUN dnf -y builddep ${MOZJS_BUILDDEPS} sysprof
 
 WORKDIR /root
 
-ADD https://include-what-you-use.org/downloads/include-what-you-use-0.14.src.tar.gz /root/
-RUN tar xzf include-what-you-use-0.14.src.tar.gz
 RUN mkdir -p include-what-you-use/_build
+ADD https://include-what-you-use.org/downloads/include-what-you-use-0.15.src.tar.gz 
/root/include-what-you-use/
+WORKDIR /root/include-what-you-use
+RUN tar xzf include-what-you-use-0.15.src.tar.gz
 
 WORKDIR /root/include-what-you-use/_build
 
@@ -53,7 +54,7 @@ RUN rm -f /root/mozjs-install/usr/lib64/libjs_static.ajs
 
 # === Actual Docker image ===
 
-FROM registry.fedoraproject.org/fedora:32
+FROM registry.fedoraproject.org/fedora:33
 
 ENV SHELL=/bin/bash
 
@@ -64,14 +65,14 @@ ENV SHELL=/bin/bash
 # final Docker image.
 RUN dnf -y install --enablerepo=fedora-debuginfo,updates-debuginfo \
     binutils cairo-debuginfo cairo-debugsource cairo-gobject-devel clang \
-    compiler-rt dbus-daemon diffutils fontconfig-debuginfo \
+    compiler-rt dbus-daemon dbus-x11 diffutils fontconfig-debuginfo \
     fontconfig-debugsource gcc-c++ git glib2-debuginfo glib2-debugsource \
     glib2-devel glibc-debuginfo glibc-debuginfo-common gnome-desktop-testing \
     gobject-introspection-debuginfo gobject-introspection-debugsource \
     gobject-introspection-devel gtk3-debuginfo gtk3-debugsource gtk3-devel \
     gtk4-debuginfo gtk4-debugsource gtk4-devel lcov libasan libubsan libtsan \
-    meson-0.54.0-1.fc32 ninja-build pkgconf readline-devel systemtap-sdt-devel \
-    valgrind which Xvfb xz && \
+    meson ninja-build pkgconf readline-devel systemtap-sdt-devel valgrind \
+    which Xvfb xz && \
     dnf clean all && rm -rf /var/cache/dnf
 
 COPY --from=build /root/mozjs-install/usr /usr