[gjs: 1/3] CI: Stop building mozjs68 images

[Philip Chimento <pchimento src gnome org>]

commit abe439db986ba52afd3137eb4a4542356446f117
Author: Philip Chimento <philip chimento gmail com>
Date:   Mon Nov 23 10:41:14 2020 -0800

    CI: Stop building mozjs68 images
    
    Now that we have switched to mozjs78 there's no longer a need to continue
    building new mozjs68 images. We can just use the one we currently have,
    until it's no longer needed. Switch the defaults in the Dockerfiles to
    build mozjs78 instead.

 .gitlab-ci.yml              | 14 --------------
 test/extra/Dockerfile       |  4 ++--
 test/extra/Dockerfile.debug |  4 ++--
 3 files changed, 4 insertions(+), 18 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1cbd5143..dc92c3ce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -363,28 +363,14 @@ zeal_11:
   BUILDAH_FORMAT: docker
   BUILDAH_ISOLATION: chroot
 
-fedora.mozjs68:
-  <<: *create_docker_image
-  variables:
-    <<: *docker_variables
-    DOCKERFILE: test/extra/Dockerfile
-
-fedora.mozjs68-debug:
-  <<: *create_docker_image
-  variables:
-    <<: *docker_variables
-    DOCKERFILE: test/extra/Dockerfile.debug
-
 fedora.mozjs78:
   <<: *create_docker_image
   variables:
     <<: *docker_variables
     DOCKERFILE: test/extra/Dockerfile
-    ARGS: --build-arg MOZJS_BRANCH=mozjs78 --build-arg MOZJS_BUILDDEPS=mozjs78 --build-arg BUILD_OPTS=
 
 fedora.mozjs78-debug:
   <<: *create_docker_image
   variables:
     <<: *docker_variables
     DOCKERFILE: test/extra/Dockerfile.debug
-    ARGS: --build-arg MOZJS_BRANCH=mozjs78 --build-arg MOZJS_BUILDDEPS=mozjs78 --build-arg BUILD_OPTS=
diff --git a/test/extra/Dockerfile b/test/extra/Dockerfile
index beb2c022..8da6c469 100644
--- a/test/extra/Dockerfile
+++ b/test/extra/Dockerfile
@@ -3,9 +3,9 @@
 # === Build Spidermonkey stage ===
 
 FROM registry.fedoraproject.org/fedora:32 AS mozjs-build
-ARG MOZJS_BRANCH=mozjs68
+ARG MOZJS_BRANCH=mozjs78
 ARG MOZJS_BUILDDEPS=${MOZJS_BRANCH}
-ARG BUILD_OPTS="--enable-posix-nspr-emulation --enable-unaligned-private-values"
+ARG BUILD_OPTS=
 
 ENV SHELL=/bin/bash
 
diff --git a/test/extra/Dockerfile.debug b/test/extra/Dockerfile.debug
index 0c01e78f..c87445c5 100644
--- a/test/extra/Dockerfile.debug
+++ b/test/extra/Dockerfile.debug
@@ -3,9 +3,9 @@
 # === Build stage ===
 
 FROM registry.fedoraproject.org/fedora:32 AS build
-ARG MOZJS_BRANCH=mozjs68
+ARG MOZJS_BRANCH=mozjs78
 ARG MOZJS_BUILDDEPS=${MOZJS_BRANCH}
-ARG BUILD_OPTS="--enable-posix-nspr-emulation --enable-unaligned-private-values"
+ARG BUILD_OPTS=
 
 ENV SHELL=/bin/bash