[gjs: 5/6] Add CI images for mozjs91.
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs: 5/6] Add CI images for mozjs91.
- Date: Sat, 9 Oct 2021 02:54:58 +0000 (UTC)
commit 576e88c862715d0c2982a115ead88ceb8053a52e
Author: Evan Welsh <contact evanwelsh com>
Date: Sat Jul 10 21:34:26 2021 -0700
Add CI images for mozjs91.
.gitlab-ci.yml | 14 ++++++++++++++
test/extra/Dockerfile | 7 ++++---
test/extra/Dockerfile.debug | 6 +++---
3 files changed, 21 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0be76b82..7e71eeb7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -422,3 +422,17 @@ fedora.mozjs78-debug:
variables:
<<: *docker_variables
DOCKERFILE: test/extra/Dockerfile.debug
+
+fedora.mozjs91:
+ <<: *create_docker_image
+ variables:
+ <<: *docker_variables
+ DOCKERFILE: test/extra/Dockerfile
+ ARGS: --build-arg MOZJS_BRANCH=mozjs91 --build-arg MOZJS_BUILDDEPS=mozjs78 --build-arg BUILD_OPTS=
+
+fedora.mozjs91-debug:
+ <<: *create_docker_image
+ variables:
+ <<: *docker_variables
+ DOCKERFILE: test/extra/Dockerfile.debug
+ ARGS: --build-arg MOZJS_BRANCH=mozjs91 --build-arg MOZJS_BUILDDEPS=mozjs78 --build-arg BUILD_OPTS=
diff --git a/test/extra/Dockerfile b/test/extra/Dockerfile
index 3e6322e0..5f21a9c6 100644
--- a/test/extra/Dockerfile
+++ b/test/extra/Dockerfile
@@ -6,11 +6,12 @@
FROM registry.fedoraproject.org/fedora:34 AS mozjs-build
ARG MOZJS_BRANCH=mozjs78
ARG MOZJS_BUILDDEPS=${MOZJS_BRANCH}
-ARG BUILD_OPTS=
+ARG BUILD_OPTS=AUTOCONF=autoconf
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
@@ -21,7 +22,7 @@ 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 e0af4033..3d577040 100644
--- a/test/extra/Dockerfile.debug
+++ b/test/extra/Dockerfile.debug
@@ -6,12 +6,12 @@
FROM registry.fedoraproject.org/fedora:34 AS build
ARG MOZJS_BRANCH=mozjs78
ARG MOZJS_BUILDDEPS=${MOZJS_BRANCH}
-ARG BUILD_OPTS=
+ARG BUILD_OPTS=AUTOCONF=autoconf
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
@@ -35,7 +35,7 @@ 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]