[gjs: 1/2] CI: Create mozjs68 CI images

[Philip Chimento <pchimento src gnome org>]

commit a8095ee8c5bea57d09fef744b1e9ab4b553d882a
Author: Philip Chimento <philip chimento gmail com>
Date:   Fri Dec 6 21:56:37 2019 -0800

    CI: Create mozjs68 CI images
    
    These will be based on the mozjs68 branch of the ptomato/mozjs
    repository.
    
    See #270.

 .gitlab-ci.yml    | 27 +++++++++++++++++++++++++++
 test/ci-images.sh |  6 +++---
 2 files changed, 30 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b09863af..581d578a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -359,3 +359,30 @@ fedora.mozjs60-debug:
   except:
     variables:
       - $CI_COMMIT_MESSAGE =~ /\[skip images\]/ && $CI_COMMIT_MESSAGE =~ /fedora.mozjs60-debug/
+
+fedora.mozjs68:
+  <<: *create_docker_image
+  variables:
+    DOCKER_DRIVER: overlay
+    # https://about.gitlab.com/2019/07/31/docker-in-docker-with-docker-19-dot-03
+    DOCKER_TLS_CERTDIR: ""
+    IMAGE: "fedora:rawhide"
+    NAME: "fedora.mozjs68"
+    MOZJS_BRANCH: mozjs68
+  except:
+    variables:
+      - $CI_COMMIT_MESSAGE =~ /\[skip images\]/ && $CI_COMMIT_MESSAGE =~ /fedora.mozjs68/
+
+fedora.mozjs68-debug:
+  <<: *create_docker_image
+  variables:
+    BUILD_OPTS: "--enable-debug"
+    DOCKER_DRIVER: overlay
+    # https://about.gitlab.com/2019/07/31/docker-in-docker-with-docker-19-dot-03
+    DOCKER_TLS_CERTDIR: ""
+    IMAGE: "fedora:rawhide"
+    NAME: "fedora.mozjs68-debug"
+    MOZJS_BRANCH: mozjs68
+  except:
+    variables:
+      - $CI_COMMIT_MESSAGE =~ /\[skip images\]/ && $CI_COMMIT_MESSAGE =~ /fedora.mozjs68-debug/
diff --git a/test/ci-images.sh b/test/ci-images.sh
index e84a7be6..e3b3cbb0 100755
--- a/test/ci-images.sh
+++ b/test/ci-images.sh
@@ -8,14 +8,14 @@ function do_Install_Dependencies(){
 
     # Base dependencies: CI scripts, mozjs, gjs
     # mozjs and gjs build dependencies adapted from the lists in:
-    # https://src.fedoraproject.org/rpms/mozjs60/blob/master/f/mozjs60.spec
+    # https://src.fedoraproject.org/rpms/mozjs68/blob/master/f/mozjs68.spec
     # https://src.fedoraproject.org/rpms/gjs/blob/master/f/gjs.spec
     dnf -y install @c-development @development-tools clang compiler-rt \
         gnome-desktop-testing lcov libasan libubsan libtsan meson ninja-build \
         systemtap-sdt-devel Xvfb xz \
         \
-        perl-devel 'pkgconfig(libffi)' 'pkgconfig(zlib)' python2-devel \
-        readline-devel which /usr/bin/zip \
+        cargo clang-devel llvm llvm-devel perl-devel 'pkgconfig(libffi)' \
+        'pkgconfig(zlib)' python2-devel readline-devel rust which zip \
         \
         autoconf-archive cairo-gobject-devel diffutils dbus-daemon dbus-x11 \
         dbus-glib-devel glib2-devel gobject-introspection-devel gtk3-devel \