luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-24 03:02:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

ci: Pin meson version to 0.46.1 when generating docker image

Browse Source 
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.
This commit is contained in:
Xavier Claessens 2018-06-22 11:02:02 -04:00
parent e5ff26d657
commit 250205a94b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci/Dockerfile
View File

@ -36,13 +36,13 @@ RUN dnf -y install \
zlib-devel \ zlib-devel \
&& dnf clean all && dnf clean all
RUN pip3 install meson
COPY setup-android-ndk.sh . COPY setup-android-ndk.sh .
RUN ./setup-android-ndk.sh RUN ./setup-android-ndk.sh
COPY cross_file_mingw64.txt /opt COPY cross_file_mingw64.txt /opt
RUN pip3 install meson==0.46.1
ARG HOST_USER_ID=5555 ARG HOST_USER_ID=5555
ENV HOST_USER_ID ${HOST_USER_ID} ENV HOST_USER_ID ${HOST_USER_ID}
RUN useradd -u $HOST_USER_ID -ms /bin/bash user RUN useradd -u $HOST_USER_ID -ms /bin/bash user