[gjs: 1/2] CI: Build images using Fedora 34 as the base

[Philip Chimento <pchimento src gnome org>]

commit 409035f5b96ab1c456bfa3ef5a820ecb34d16159
Author: Philip Chimento <philip chimento gmail com>
Date:   Sat Sep 25 15:28:08 2021 -0700

    CI: Build images using Fedora 34 as the base
    
    This is an upgrade to continue building against more recent versions.

 test/extra/Dockerfile       | 4 ++--
 test/extra/Dockerfile.debug | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/test/extra/Dockerfile b/test/extra/Dockerfile
index 9ada5908..3e6322e0 100644
--- a/test/extra/Dockerfile
+++ b/test/extra/Dockerfile
@@ -3,7 +3,7 @@
 
 # === Build Spidermonkey stage ===
 
-FROM registry.fedoraproject.org/fedora:33 AS mozjs-build
+FROM registry.fedoraproject.org/fedora:34 AS mozjs-build
 ARG MOZJS_BRANCH=mozjs78
 ARG MOZJS_BUILDDEPS=${MOZJS_BRANCH}
 ARG BUILD_OPTS=
@@ -28,7 +28,7 @@ RUN rm -f /root/mozjs-install/usr/lib64/libjs_static.ajs
 
 # === Actual Docker image ===
 
-FROM registry.fedoraproject.org/fedora:33
+FROM registry.fedoraproject.org/fedora:34
 
 ENV SHELL=/bin/bash
 
diff --git a/test/extra/Dockerfile.debug b/test/extra/Dockerfile.debug
index b4190db2..e0af4033 100644
--- a/test/extra/Dockerfile.debug
+++ b/test/extra/Dockerfile.debug
@@ -3,7 +3,7 @@
 
 # === Build stage ===
 
-FROM registry.fedoraproject.org/fedora:33 AS build
+FROM registry.fedoraproject.org/fedora:34 AS build
 ARG MOZJS_BRANCH=mozjs78
 ARG MOZJS_BUILDDEPS=${MOZJS_BRANCH}
 ARG BUILD_OPTS=
@@ -17,9 +17,9 @@ RUN dnf -y builddep ${MOZJS_BUILDDEPS}
 WORKDIR /root
 
 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/
+ADD https://include-what-you-use.org/downloads/include-what-you-use-0.16.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
+RUN tar xzf include-what-you-use-0.16.src.tar.gz --strip-components=1
 
 WORKDIR /root/include-what-you-use/_build
 
@@ -43,7 +43,7 @@ RUN rm -f /root/mozjs-install/usr/lib64/libjs_static.ajs
 
 # === Actual Docker image ===
 
-FROM registry.fedoraproject.org/fedora:33
+FROM registry.fedoraproject.org/fedora:34
 
 ENV SHELL=/bin/bash