[gjs: 14/16] Dockerfile: Allow to pass the mozjs base to use for build-deps
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs: 14/16] Dockerfile: Allow to pass the mozjs base to use for build-deps
- Date: Mon, 23 Nov 2020 18:24:47 +0000 (UTC)
commit 4edf8cebdfe2c2f8fc8c811de17c209412bb94db
Author: Marco Trevisan (TreviƱo) <mail 3v1n0 net>
Date: Mon Oct 12 12:55:21 2020 +0200
Dockerfile: Allow to pass the mozjs base to use for build-deps
And use them for mozjs78 builds, as build-deps may change
.gitlab-ci.yml | 4 ++--
test/extra/Dockerfile | 3 ++-
test/extra/Dockerfile.debug | 3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ade86eef..ca69a21f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -382,11 +382,11 @@ fedora.mozjs78:
variables:
<<: *docker_variables
DOCKERFILE: test/extra/Dockerfile
- ARGS: --build-arg MOZJS_BRANCH=mozjs78 --build-arg BUILD_OPTS=
+ ARGS: --build-arg MOZJS_BRANCH=mozjs78 --build-arg MOZJS_BUILDDEPS=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=
+ ARGS: --build-arg MOZJS_BRANCH=mozjs78 --build-arg MOZJS_BUILDDEPS=mozjs78 --build-arg BUILD_OPTS=
diff --git a/test/extra/Dockerfile b/test/extra/Dockerfile
index 2d11fda9..beb2c022 100644
--- a/test/extra/Dockerfile
+++ b/test/extra/Dockerfile
@@ -4,12 +4,13 @@
FROM registry.fedoraproject.org/fedora:32 AS mozjs-build
ARG MOZJS_BRANCH=mozjs68
+ARG MOZJS_BUILDDEPS=${MOZJS_BRANCH}
ARG BUILD_OPTS="--enable-posix-nspr-emulation --enable-unaligned-private-values"
ENV SHELL=/bin/bash
RUN dnf -y install 'dnf-command(builddep)' git make which llvm-devel
-RUN dnf -y builddep mozjs68
+RUN dnf -y builddep ${MOZJS_BUILDDEPS}
WORKDIR /root
diff --git a/test/extra/Dockerfile.debug b/test/extra/Dockerfile.debug
index d708bf8f..0c01e78f 100644
--- a/test/extra/Dockerfile.debug
+++ b/test/extra/Dockerfile.debug
@@ -4,13 +4,14 @@
FROM registry.fedoraproject.org/fedora:32 AS build
ARG MOZJS_BRANCH=mozjs68
+ARG MOZJS_BUILDDEPS=${MOZJS_BRANCH}
ARG BUILD_OPTS="--enable-posix-nspr-emulation --enable-unaligned-private-values"
ENV SHELL=/bin/bash
RUN dnf -y install 'dnf-command(builddep)' clang-devel cmake git llvm-devel \
make ninja-build which
-RUN dnf -y builddep mozjs68 sysprof
+RUN dnf -y builddep ${MOZJS_BUILDDEPS} sysprof
WORKDIR /root
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]