diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2019-03-15 12:18:54 +0100 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2019-03-15 12:31:38 +0100 |
| commit | ad38913839ba927fbfc8f686397e2750454445eb (patch) | |
| tree | a9d0e58e56ef8983e590cdd0972401847e6f0bfa | |
| parent | d2af7d20850bb65cd2014d43b88b689f2eed996e (diff) | |
| download | gobject-introspection-ad38913839ba927fbfc8f686397e2750454445eb.tar.gz | |
ci: test with Python 3.5
| -rw-r--r-- | .gitlab-ci.yml | 24 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile | 17 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker.sh | 2 |
3 files changed, 36 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f01e759e..72d6f7a1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ stages: - build - deploy -image: registry.gitlab.gnome.org/gnome/gobject-introspection:v4 +image: registry.gitlab.gnome.org/gnome/gobject-introspection:v5 cache: paths: @@ -15,6 +15,7 @@ fedora-x86_64-meson: CCACHE_DIR: "${CI_PROJECT_DIR}/_ccache" CFLAGS: "-Werror" script: + - python3 -m pip install --user mako markdown - meson --prefix /usr --libdir /usr/lib64 --buildtype debug -Ddoctool=true -Dgtk_doc=true -Dcairo=true -Dpython=python3 _build . - cd _build - ninja @@ -34,6 +35,27 @@ fedora-x86_64-meson: - "${CI_PROJECT_DIR}/_build/meson-logs" - public +fedora-x86_64-python3.5: + stage: build + variables: + CCACHE_BASEDIR: "${CI_PROJECT_DIR}" + CCACHE_DIR: "${CI_PROJECT_DIR}/_ccache" + PYENV_VERSION: "3.5.6" + script: + - python3 -m pip install --user mako markdown + - meson --prefix /usr --libdir /usr/lib64 --buildtype debug -Ddoctool=true -Dgtk_doc=true -Dcairo=true -Dpython=python3 _build . + - cd _build + - ninja + - meson test --print-errorlogs --suite=gobject-introspection --no-suite=glib + except: + - tags + artifacts: + when: always + name: "gi-_${CI_COMMIT_REF_NAME}" + paths: + - "${CI_PROJECT_DIR}/_build/meson-logs" + - public + msys2-mingw32-meson: stage: build tags: diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 0330e3af..dd7a0ccc 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -23,26 +23,27 @@ RUN dnf -y install \ glibc-headers \ gtk-doc \ itstool \ - libtool \ - libXft-devel \ - libXfixes-devel \ libattr-devel \ libffi-devel \ libmount-devel \ libselinux-devel \ + libtool \ + libXfixes-devel \ + libXft-devel \ libxml2-devel \ libxslt \ make \ mesa-libGL-devel \ ninja-build \ + openssl-devel \ pcre-devel \ python3 \ python3-devel \ - python3-mako \ - python3-markdown \ python3-pip \ python3-wheel \ + readline-devel \ redhat-rpm-config \ + sqlite-devel \ systemtap-sdt-devel \ zlib-devel \ && dnf clean all @@ -57,3 +58,9 @@ USER user WORKDIR /home/user ENV LANG C.UTF-8 + +ENV PYENV_ROOT /home/user/.pyenv +ENV PATH="${PYENV_ROOT}/shims:${PYENV_ROOT}/bin:${PATH}" +ENV PYTHON_CONFIGURE_OPTS="--enable-shared" +RUN curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash +RUN pyenv install 3.5.6 diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh index ef014646..2334edad 100755 --- a/.gitlab-ci/run-docker.sh +++ b/.gitlab-ci/run-docker.sh @@ -2,7 +2,7 @@ set -e -TAG="registry.gitlab.gnome.org/gnome/gobject-introspection:v4" +TAG="registry.gitlab.gnome.org/gnome/gobject-introspection:v5" sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \ --file "Dockerfile" . |