[glib: 1/5] ci: Pin meson version to 0.46.1 when generating docker image
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 1/5] ci: Pin meson version to 0.46.1 when generating docker image
- Date: Fri, 22 Jun 2018 17:21:02 +0000 (UTC)
commit 250205a94bb4301d1e1910a6e9cc5ea52871185d
Author: Xavier Claessens <xavier claessens collabora com>
Date: Fri Jun 22 11:02:02 2018 -0400
ci: Pin meson version to 0.46.1 when generating docker image
Also move it after running setup-android-ndk.sh so docker can keep that
stage in cache and won't run it again when changing meson version.
.gitlab-ci/Dockerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index cdb54eb16..eb21ed2a3 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -36,13 +36,13 @@ RUN dnf -y install \
zlib-devel \
&& dnf clean all
-RUN pip3 install meson
-
COPY setup-android-ndk.sh .
RUN ./setup-android-ndk.sh
COPY cross_file_mingw64.txt /opt
+RUN pip3 install meson==0.46.1
+
ARG HOST_USER_ID=5555
ENV HOST_USER_ID ${HOST_USER_ID}
RUN useradd -u $HOST_USER_ID -ms /bin/bash user
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]