From ad38913839ba927fbfc8f686397e2750454445eb Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Fri, 15 Mar 2019 12:18:54 +0100
Subject: ci: test with Python 3.5

---
 .gitlab-ci/Dockerfile    | 17 ++++++++++++-----
 .gitlab-ci/run-docker.sh |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

(limited to '.gitlab-ci')

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" .
-- 
cgit v1.2.1