summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorChristoph Reiter <reiter.christoph@gmail.com>2018-11-04 13:23:17 +0100
committerChristoph Reiter <reiter.christoph@gmail.com>2018-11-05 16:52:35 +0000
commit1ff23a5d290de418655e7e67e522eacbda317115 (patch)
tree2655940d5153486c485402db2c53d51ad67ad364 /.gitlab-ci
parent5156a1d5dca41f9e5197809e42569d527449ecbb (diff)
downloadgobject-introspection-1ff23a5d290de418655e7e67e522eacbda317115.tar.gz
Drop Python 2 support, require Python 3.4+
glib did the same thing this cycle, see https://gitlab.gnome.org/GNOME/glib/merge_requests/196 for details
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/Dockerfile4
-rwxr-xr-x.gitlab-ci/run-docker.sh2
2 files changed, 1 insertions, 5 deletions
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index bb770eac..0066675a 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -42,10 +42,6 @@ RUN dnf -y install \
python3-markdown \
python3-pip \
python3-wheel \
- python2 \
- python2-devel \
- python2-mako \
- python2-markdown \
redhat-rpm-config \
systemtap-sdt-devel \
zlib-devel \
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index 77eff633..31c49a2c 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:v1"
+TAG="registry.gitlab.gnome.org/gnome/gobject-introspection:v2"
sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
--file "Dockerfile" .