[gjs/mozjs78] Add CI images for mozjs78.



commit e7e1e096c8ea173f5cf14c70c303a96203ee267b
Author: Evan Welsh <noreply evanwelsh com>
Date:   Sun Jul 5 23:35:04 2020 -0500

    Add CI images for mozjs78.

 .gitlab-ci.yml              | 30 +++++++++++++++---------------
 test/extra/Dockerfile       | 19 +++++++++++--------
 test/extra/Dockerfile.debug | 17 ++++++++++-------
 3 files changed, 36 insertions(+), 30 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9b85658d..309c503d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ stages:
 - deploy
 
 .coverage: &coverage
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs68
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78
   variables:
     TASK_ID: "coverage"
     coverage: '/^  lines.*(\d+\.\d+\%)/'
@@ -48,7 +48,7 @@ stages:
 build_recommended:
   <<: *build
   stage: source_check
-  image: registry.gitlab.gnome.org/gnome/gjs:job-745493_fedora.mozjs68-debug  # pinned on purpose
+  image: registry.gitlab.gnome.org/gnome/gjs:job-745493_fedora.mozjs78-debug  # pinned on purpose
   variables:
     TASK_ID: "fedora-x86_64-gcc-debug-default-check"
     TEST_OPTS: --verbose --no-stdsplit --print-errorlogs
@@ -60,7 +60,7 @@ sanitizer_gcc:
   stage: test
   tags:
     - privileged  # LSAN needs CAP_SYS_PTRACE
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs68
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78
   variables:
     TASK_ID: "fedora-x86_64-gcc-default-ubsan_asan-check"
     CONFIG_OPTS: -Db_sanitize=address,undefined
@@ -73,7 +73,7 @@ sanitizer_gcc:
 build_maximal:
   <<: *build
   stage: test
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs68-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
   variables:
     TASK_ID: "fedora-x86_64-clang-default-maximal-check"
     CC: clang
@@ -89,7 +89,7 @@ build_maximal:
 build_minimal:
   <<: *build
   stage: test
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs68
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78
   variables:
     TASK_ID: "ubuntu-x86_64-gcc-default-minimal-check"
     CONFIG_OPTS: >-
@@ -191,7 +191,7 @@ eslint:
 iwyu:
   when: on_success
   stage: source_check
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs68-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
   script:
     - ./tools/run_iwyu.sh origin/master
   only:
@@ -213,7 +213,7 @@ coverage:
 iwyu-full:
   when: manual
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs68-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
   script:
     - ./tools/run_iwyu.sh
 
@@ -222,7 +222,7 @@ sanitizer_clang:
   stage: manual
   tags:
     - privileged  # LSAN needs CAP_SYS_PTRACE
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs68
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78
   variables:
     TASK_ID: "fedora-x86_64-clang_ubsan_asan-default-default-check"
     CC: clang
@@ -234,7 +234,7 @@ sanitizer_clang:
 installed_tests:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs68
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78
   variables:
     TASK_ID: "fedora-x86_64-gcc-default-default-installed_tests"
     CONFIG_OPTS: -Dinstalled_tests=true -Dprefix=/usr
@@ -251,7 +251,7 @@ installed_tests:
 valgrind:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs68
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78
   variables:
     TASK_ID: "fedora-x86_64-gcc-default-default-valgrind_check"
     TEST_OPTS: --setup=valgrind
@@ -264,7 +264,7 @@ valgrind:
 zeal_2:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs68-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
   variables:
     TASK_ID: "fedora-x86_64-gcc-debug-default-check_zeal2"
     TEST_OPTS: --setup=extra_gc
@@ -275,7 +275,7 @@ zeal_2:
 zeal_4:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs68-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
   variables:
     TASK_ID: "fedora-x86_64-gcc-debug-default-check_zeal4"
     TEST_OPTS: --setup=pre_verify
@@ -286,7 +286,7 @@ zeal_4:
 zeal_11:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs68-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
   variables:
     TASK_ID: "fedora-x86_64-gcc-debug-default-check_zeal11"
     TEST_OPTS: --setup=post_verify
@@ -337,13 +337,13 @@ alpine.cpplint:
     <<: *docker_variables
     DOCKERFILE: test/extra/Dockerfile.alpine.cpplint
 
-fedora.mozjs68:
+fedora.mozjs78:
   <<: *create_docker_image
   variables:
     <<: *docker_variables
     DOCKERFILE: test/extra/Dockerfile
 
-fedora.mozjs68-debug:
+fedora.mozjs78-debug:
   <<: *create_docker_image
   variables:
     <<: *docker_variables
diff --git a/test/extra/Dockerfile b/test/extra/Dockerfile
index ae5590c9..4c6f62d3 100644
--- a/test/extra/Dockerfile
+++ b/test/extra/Dockerfile
@@ -1,24 +1,27 @@
 # === Build Spidermonkey stage ===
 
 FROM fedora:32 AS mozjs-build
-ARG MOZJS_BRANCH=mozjs68
+ARG RELEASE_VERSION=78.0.1
 ARG BUILD_OPTS=
 
 ENV SHELL=/bin/bash
 
-RUN dnf -y install 'dnf-command(builddep)' git make which
+RUN dnf -y install 'dnf-command(builddep)' git make which xz clang llvm rust
 RUN dnf -y builddep mozjs68
 
 WORKDIR /root
 
-RUN git clone --depth 1 https://github.com/ptomato/mozjs.git -b ${MOZJS_BRANCH}
-RUN mkdir -p mozjs/_build
+RUN curl -# -o firefox-${RELEASE_VERSION}esr.source.tar.xz 
https://archive.mozilla.org/pub/firefox/releases/${RELEASE_VERSION}esr/source/firefox-${RELEASE_VERSION}esr.source.tar.xz
+RUN unxz firefox-${RELEASE_VERSION}esr.source.tar.xz
+RUN tar -xf firefox-${RELEASE_VERSION}esr.source.tar
 
-WORKDIR /root/mozjs/_build
+RUN mkdir -p firefox-${RELEASE_VERSION}/js/src/_build
+
+WORKDIR /root/firefox-${RELEASE_VERSION}/js/src/_build
+
+RUN ../configure --prefix=/usr --libdir=/usr/lib64 --disable-jemalloc \
+--without-system-icu --with-system-zlib --with-intl-api AUTOCONF=autoconf ${BUILD_OPTS}
 
-RUN ../js/src/configure --prefix=/usr --libdir=/usr/lib64 --disable-jemalloc \
-    --enable-posix-nspr-emulation --enable-unaligned-private-values \
-    --with-system-zlib --with-intl-api AUTOCONF=autoconf ${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 fd3dd6b6..445bf3b7 100644
--- a/test/extra/Dockerfile.debug
+++ b/test/extra/Dockerfile.debug
@@ -1,13 +1,13 @@
 # === Build stage ===
 
 FROM fedora:32 AS build
-ARG MOZJS_BRANCH=mozjs68
+ARG RELEASE_VERSION=78.0.1
 ARG BUILD_OPTS=
 
 ENV SHELL=/bin/bash
 
 RUN dnf -y install 'dnf-command(builddep)' clang-devel cmake git llvm-devel \
-    make ninja-build which
+    make ninja-build which xz clang llvm rust
 RUN dnf -y builddep mozjs68
 
 WORKDIR /root
@@ -24,15 +24,18 @@ RUN DESTDIR=/root/iwyu-install ninja install
 
 WORKDIR /root
 
-RUN git clone --depth 1 https://github.com/ptomato/mozjs.git -b ${MOZJS_BRANCH}
-RUN mkdir -p mozjs/_build
+RUN curl -# -o firefox-${RELEASE_VERSION}esr.source.tar.xz 
https://archive.mozilla.org/pub/firefox/releases/${RELEASE_VERSION}esr/source/firefox-${RELEASE_VERSION}esr.source.tar.xz
+RUN unxz firefox-${RELEASE_VERSION}esr.source.tar.xz
+RUN tar -xf firefox-${RELEASE_VERSION}esr.source.tar
 
-WORKDIR /root/mozjs/_build
+RUN mkdir -p firefox-${RELEASE_VERSION}/js/src/_build
 
-RUN ../js/src/configure --prefix=/usr --libdir=/usr/lib64 --disable-jemalloc \
-    --enable-posix-nspr-emulation --enable-unaligned-private-values \
+WORKDIR /root/firefox-${RELEASE_VERSION}/js/src/_build
+
+RUN ../configure --prefix=/usr --libdir=/usr/lib64 --disable-jemalloc \
     --with-system-zlib --with-intl-api --enable-debug AUTOCONF=autoconf \
     ${BUILD_OPTS}
+
 RUN make -j$(nproc)
 RUN DESTDIR=/root/mozjs-install make install
 RUN rm -f /root/mozjs-install/usr/lib64/libjs_static.ajs


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]