diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2018-03-29 10:09:10 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2018-03-29 10:09:10 +0100 |
| commit | 400dcb3c496a47269688073e600395120a6a45c8 (patch) | |
| tree | 4e2fdfa8f998f201cb7f847f2d56e114ea428f88 /.gitlab-ci | |
| parent | 55b99a36cbb9a8cb344f0ebb4b4faaef036d6b3b (diff) | |
| download | gobject-introspection-400dcb3c496a47269688073e600395120a6a45c8.tar.gz | |
ci: Install Meson from PyPI
The base Fedora image we use for CI doesn't always have the version of
Meson we depend on; let's use Python's pip to install Meson, instead.
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/Dockerfile | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 8ec66b00..01913f24 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -29,12 +29,18 @@ RUN dnf -y install \ libxml2-devel \ libxslt \ mesa-libGL-devel \ - meson \ + ninja-build \ pcre-devel \ + python3 \ python3-devel \ python3-mako \ + python3-pip \ + python3-wheel \ systemtap-sdt-devel \ - zlib-devel + zlib-devel \ + && dnf clean all + +RUN pip3 install meson ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} @@ -43,4 +49,4 @@ RUN useradd -u $HOST_USER_ID -ms /bin/bash user USER user WORKDIR /home/user -ENV LANG C.utf8 +ENV LANG C.UTF-8 |