[gjs/mozjs91: 5/10] Add CI images for mozjs91.

[Evan Welsh <ewlsh src gnome org>]

commit 9aee5c30863115667eecd0feca05449558be95df
Author: Evan Welsh <contact evanwelsh com>
Date:   Sat Jul 10 21:34:26 2021 -0700

    Add CI images for mozjs91.

 .gitlab-ci.yml              | 34 +++++++++++++++++-----------------
 test/extra/Dockerfile       | 10 +++++++---
 test/extra/Dockerfile.debug |  9 ++++++---
 3 files changed, 30 insertions(+), 23 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2a3289e5..4fb5fe20 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2017 Claudio André <claudioandre br gmail com>
 ---
 include:
-  - remote: 
'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/7ea696055e322cc7aa4bcbe5422b56a198c4bdff/templates/alpine.yml'
+  - remote: 'https://gitlab.gnome.org/ewlsh/ci-templates/-/raw/master/templates/alpine.yml'
 
 stages:
   - prepare
@@ -31,7 +31,7 @@ build-alpine-image:
       mkdir -p /cwd
 
 .coverage: &coverage
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91-debug
   variables:
     TASK_ID: "coverage"
     coverage: '/^  lines.*(\d+\.\d+\%)/'
@@ -82,7 +82,7 @@ sanitizer_gcc:
   stage: test
   tags:
     - asan # LSAN needs CAP_SYS_PTRACE
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91-debug
   variables:
     TASK_ID: "fedora-x86_64-gcc-default-ubsan_asan-check"
     CONFIG_OPTS: -Db_sanitize=address,undefined
@@ -95,7 +95,7 @@ sanitizer_thread_gcc:
   stage: test
   tags:
     - asan # TSAN needs CAP_SYS_PTRACE
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91-debug
   variables:
     TASK_ID: "fedora-x86_64-gcc-default-tsan-check"
     CONFIG_OPTS: -Db_sanitize=thread
@@ -109,7 +109,7 @@ sanitizer_thread_gcc:
 build_maximal:
   <<: *build
   stage: test
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91-debug
   variables:
     TASK_ID: "fedora-x86_64-clang-default-maximal-check"
     CC: clang
@@ -126,7 +126,7 @@ build_maximal:
 build_minimal:
   <<: *build
   stage: test
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91
   variables:
     TASK_ID: "ubuntu-x86_64-gcc-default-minimal-check"
     CONFIG_OPTS: >-
@@ -138,7 +138,7 @@ build_minimal:
 build_unity:
   <<: *build
   stage: test
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91
   variables:
     TASK_ID: "fedora-x86_64-gcc-default-unity-check"
     # unity-size here is forced to use an high number to check whether we can
@@ -274,7 +274,7 @@ pch_check:
 iwyu:
   when: on_success
   stage: source_check
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91-debug
   variables:
     CONFIG_OPTS: -Db_pch=false
   script:
@@ -329,7 +329,7 @@ coverage:
 iwyu-full:
   when: manual
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91-debug
   script:
     - meson setup _build
     - ./tools/run_iwyu.sh
@@ -341,7 +341,7 @@ sanitizer_clang:
   stage: manual
   tags:
     - asan # LSAN needs CAP_SYS_PTRACE
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91-debug
   variables:
     TASK_ID: "fedora-x86_64-clang_ubsan_asan-default-default-check"
     CC: clang
@@ -355,7 +355,7 @@ sanitizer_clang:
 installed_tests:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91-debug
   variables:
     TASK_ID: "fedora-x86_64-gcc-default-default-installed_tests"
     CONFIG_OPTS: -Dinstalled_tests=true -Dprefix=/usr
@@ -372,7 +372,7 @@ installed_tests:
 valgrind:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91-debug
   variables:
     TASK_ID: "fedora-x86_64-gcc-default-default-valgrind_check"
     TEST_OPTS: --setup=valgrind
@@ -385,7 +385,7 @@ valgrind:
 zeal_2:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91-debug
   variables:
     TASK_ID: "fedora-x86_64-gcc-debug-default-check_zeal2"
     TEST_OPTS: --setup=extra_gc
@@ -396,7 +396,7 @@ zeal_2:
 zeal_4:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91-debug
   variables:
     TASK_ID: "fedora-x86_64-gcc-debug-default-check_zeal4"
     TEST_OPTS: --setup=pre_verify
@@ -407,7 +407,7 @@ zeal_4:
 zeal_11:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91-debug
   variables:
     TASK_ID: "fedora-x86_64-gcc-debug-default-check_zeal11"
     TEST_OPTS: --setup=post_verify
@@ -450,13 +450,13 @@ zeal_11:
   BUILDAH_FORMAT: docker
   BUILDAH_ISOLATION: chroot
 
-fedora.mozjs78:
+fedora.mozjs91:
   <<: *create_docker_image
   variables:
     <<: *docker_variables
     DOCKERFILE: test/extra/Dockerfile
 
-fedora.mozjs78-debug:
+fedora.mozjs91-debug:
   <<: *create_docker_image
   variables:
     <<: *docker_variables
diff --git a/test/extra/Dockerfile b/test/extra/Dockerfile
index 9ada5908..0eb41dca 100644
--- a/test/extra/Dockerfile
+++ b/test/extra/Dockerfile
@@ -10,18 +10,22 @@ ARG BUILD_OPTS=
 
 ENV SHELL=/bin/bash
 
-RUN dnf -y install 'dnf-command(builddep)' autoconf213 git make which llvm-devel
+RUN dnf -y install 'dnf-command(builddep)' autoconf213 git make which llvm-devel \
+    xz clang llvm rust
 RUN dnf -y builddep ${MOZJS_BUILDDEPS}
 
 WORKDIR /root
 
-RUN git clone --no-tags --depth 1 https://github.com/ptomato/mozjs.git -b ${MOZJS_BRANCH}
+RUN curl -# -o mozjs.tar.xz -L 
https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/OsmkeFYMRxmYCP_q7W5jwQ/runs/0/artifacts/public/build/mozjs-91.0.0.tar.xz
+RUN unxz mozjs.tar.xz
+RUN tar -xf mozjs.tar
+RUN mv mozjs-91.0.0 mozjs
 RUN mkdir -p mozjs/_build
 
 WORKDIR /root/mozjs/_build
 
 RUN ../js/src/configure --prefix=/usr --libdir=/usr/lib64 --disable-jemalloc \
-    --with-system-zlib --with-intl-api AUTOCONF=autoconf ${BUILD_OPTS}
+    --with-system-zlib --with-intl-api ${BUILD_OPTS}
 RUN make -j$(nproc)
 RUN DESTDIR=/root/mozjs-install make install
 RUN rm -f /root/mozjs-install/usr/lib64/libjs_static.ajs
diff --git a/test/extra/Dockerfile.debug b/test/extra/Dockerfile.debug
index b4190db2..0579bd07 100644
--- a/test/extra/Dockerfile.debug
+++ b/test/extra/Dockerfile.debug
@@ -11,7 +11,7 @@ ARG BUILD_OPTS=
 ENV SHELL=/bin/bash
 
 RUN dnf -y install 'dnf-command(builddep)' autoconf213 clang-devel cmake git \
-    llvm-devel make ninja-build which
+    llvm-devel make ninja-build which xz clang llvm rust
 RUN dnf -y builddep ${MOZJS_BUILDDEPS}
 
 WORKDIR /root
@@ -29,13 +29,16 @@ RUN DESTDIR=/root/iwyu-install ninja install
 
 WORKDIR /root
 
-RUN git clone --no-tags --depth 1 https://github.com/ptomato/mozjs.git -b ${MOZJS_BRANCH}
+RUN curl -# -o mozjs.tar.xz -L 
https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/OsmkeFYMRxmYCP_q7W5jwQ/runs/0/artifacts/public/build/mozjs-91.0.0.tar.xz
+RUN unxz mozjs.tar.xz
+RUN tar -xf mozjs.tar
+RUN mv mozjs-91.0.0 mozjs
 RUN mkdir -p mozjs/_build
 
 WORKDIR /root/mozjs/_build
 
 RUN ../js/src/configure --prefix=/usr --libdir=/usr/lib64 --disable-jemalloc \
-    --with-system-zlib --with-intl-api --enable-debug AUTOCONF=autoconf \
+    --with-system-zlib --with-intl-api --enable-debug \
     ${BUILD_OPTS}
 RUN make -j$(nproc)
 RUN DESTDIR=/root/mozjs-install make install