diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2018-07-11 18:49:27 +0200 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2018-07-11 20:44:52 +0200 |
| commit | 2dbf8f4ea4992ca33c272786f860d7fc291ba89b (patch) | |
| tree | fca28df47c9d2e3afc991c19de68fe80db477e18 /.gitlab-ci | |
| parent | 4542321c383304807228f204de600aa64944c87e (diff) | |
| download | gobject-introspection-2dbf8f4ea4992ca33c272786f860d7fc291ba89b.tar.gz | |
meson: Add a "python" option to make the python to build against configurable
This allows us to build with Python 2 and run tests with it.
This requires the new "python" meson module which was added in 0.46.0 so
bump the required meson version (glib needs a newer one anyway).
Also fixes a small test error under Python 2.
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/Dockerfile | 3 | ||||
| -rw-r--r-- | .gitlab-ci/test-msys2.sh | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 8b13de05..c232b6c5 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -36,6 +36,9 @@ RUN dnf -y install \ python3-mako \ python3-pip \ python3-wheel \ + python2 \ + python2-devel \ + python2-mako \ redhat-rpm-config \ systemtap-sdt-devel \ zlib-devel \ diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh index ef69fe8f..6260ac15 100644 --- a/.gitlab-ci/test-msys2.sh +++ b/.gitlab-ci/test-msys2.sh @@ -32,7 +32,10 @@ export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache" pip3 install --upgrade --user meson==0.47.1 export PATH="$HOME/.local/bin:$PATH" -meson --buildtype debug _build +# FIXME: https://github.com/Alexpux/MINGW-packages/pull/4064 +# Passing the full interpreter path works around the issue +PYTHON="$(which python3)" +meson -Dpython="${PYTHON}" --buildtype debug _build cd _build ninja |