[gjs: 6/9] CI: Add mozjs78 images




commit 07f831feb2a4cae29e9f54835bcd7c65f4bd12c5
Author: Philip Chimento <philip chimento gmail com>
Date:   Sat Aug 1 15:30:52 2020 -0700

    CI: Add mozjs78 images
    
    The posix-nspr-emulation and unaligned-private-values options are gone,
    so we need to make those optional and blank them out for mozjs78.
    
    See: GNOME/gjs#329

 .gitlab-ci.yml              | 14 ++++++++++++++
 test/extra/Dockerfile       |  3 +--
 test/extra/Dockerfile.debug |  3 +--
 3 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 103a6c73..e8078f04 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -353,3 +353,17 @@ fedora.mozjs68-debug:
   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 BUILD_OPTS=
+
+fedora.mozjs78-debug:
+  <<: *create_docker_image
+  variables:
+    <<: *docker_variables
+    DOCKERFILE: test/extra/Dockerfile.debug
+    ARGS: --build-arg MOZJS_BRANCH=mozjs78 --build-arg BUILD_OPTS=
diff --git a/test/extra/Dockerfile b/test/extra/Dockerfile
index 6bbed87f..92db73ad 100644
--- a/test/extra/Dockerfile
+++ b/test/extra/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM fedora:32 AS mozjs-build
 ARG MOZJS_BRANCH=mozjs68
-ARG BUILD_OPTS=
+ARG BUILD_OPTS="--enable-posix-nspr-emulation --enable-unaligned-private-values"
 
 ENV SHELL=/bin/bash
 
@@ -17,7 +17,6 @@ RUN mkdir -p mozjs/_build
 WORKDIR /root/mozjs/_build
 
 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
diff --git a/test/extra/Dockerfile.debug b/test/extra/Dockerfile.debug
index 806e5cd0..e80fbfa1 100644
--- a/test/extra/Dockerfile.debug
+++ b/test/extra/Dockerfile.debug
@@ -2,7 +2,7 @@
 
 FROM fedora:32 AS build
 ARG MOZJS_BRANCH=mozjs68
-ARG BUILD_OPTS=
+ARG BUILD_OPTS="--enable-posix-nspr-emulation --enable-unaligned-private-values"
 
 ENV SHELL=/bin/bash
 
@@ -42,7 +42,6 @@ RUN mkdir -p mozjs/_build
 WORKDIR /root/mozjs/_build
 
 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 --enable-debug AUTOCONF=autoconf \
     ${BUILD_OPTS}
 RUN make -j$(nproc)


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