[gjs/mozjs91: 17/25] CI: Build only mozjs91 images

[Philip Chimento <pchimento src gnome org>]

commit 57fec488955f1dfeba2422269ebc10c3adca5796
Author: Philip Chimento <philip chimento gmail com>
Date:   Sat Oct 9 14:11:23 2021 -0700

    CI: Build only mozjs91 images
    
    No longer necessary to build mozjs78 images. MOZJS_BUILDDEPS must still be
    set to mozjs78 until the underlying OS gains a mozjs91 package.

 .gitlab-ci.yml              | 16 ++--------------
 test/extra/Dockerfile       |  4 ++--
 test/extra/Dockerfile.debug |  4 ++--
 3 files changed, 6 insertions(+), 18 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0664b780..0d3b27a8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -411,28 +411,16 @@ zeal_11:
   BUILDAH_FORMAT: docker
   BUILDAH_ISOLATION: chroot
 
-fedora.mozjs78:
-  <<: *create_docker_image
-  variables:
-    <<: *docker_variables
-    DOCKERFILE: test/extra/Dockerfile
-
-fedora.mozjs78-debug:
-  <<: *create_docker_image
-  variables:
-    <<: *docker_variables
-    DOCKERFILE: test/extra/Dockerfile.debug
-
 fedora.mozjs91:
   <<: *create_docker_image
   variables:
     <<: *docker_variables
     DOCKERFILE: test/extra/Dockerfile
-    ARGS: --build-arg MOZJS_BRANCH=mozjs91 --build-arg MOZJS_BUILDDEPS=mozjs78 --build-arg BUILD_OPTS=
+    ARGS: --build-arg MOZJS_BUILDDEPS=mozjs78
 
 fedora.mozjs91-debug:
   <<: *create_docker_image
   variables:
     <<: *docker_variables
     DOCKERFILE: test/extra/Dockerfile.debug
-    ARGS: --build-arg MOZJS_BRANCH=mozjs91 --build-arg MOZJS_BUILDDEPS=mozjs78 --build-arg BUILD_OPTS=
+    ARGS: --build-arg MOZJS_BUILDDEPS=mozjs78
diff --git a/test/extra/Dockerfile b/test/extra/Dockerfile
index 5f21a9c6..82a14024 100644
--- a/test/extra/Dockerfile
+++ b/test/extra/Dockerfile
@@ -4,9 +4,9 @@
 # === Build Spidermonkey stage ===
 
 FROM registry.fedoraproject.org/fedora:34 AS mozjs-build
-ARG MOZJS_BRANCH=mozjs78
+ARG MOZJS_BRANCH=mozjs91
 ARG MOZJS_BUILDDEPS=${MOZJS_BRANCH}
-ARG BUILD_OPTS=AUTOCONF=autoconf
+ARG BUILD_OPTS=
 
 ENV SHELL=/bin/bash
 
diff --git a/test/extra/Dockerfile.debug b/test/extra/Dockerfile.debug
index 3d577040..66a492aa 100644
--- a/test/extra/Dockerfile.debug
+++ b/test/extra/Dockerfile.debug
@@ -4,9 +4,9 @@
 # === Build stage ===
 
 FROM registry.fedoraproject.org/fedora:34 AS build
-ARG MOZJS_BRANCH=mozjs78
+ARG MOZJS_BRANCH=mozjs91
 ARG MOZJS_BUILDDEPS=${MOZJS_BRANCH}
-ARG BUILD_OPTS=AUTOCONF=autoconf
+ARG BUILD_OPTS=
 
 ENV SHELL=/bin/bash