ci: update docker image to cosmic; update python versions

4 files changed, 8 insertions, 16 deletions

diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index a72c7184..48e29609 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:bionic
+FROM ubuntu:cosmic
 
 RUN apt-get update && apt-get install -y \
     build-essential \
@@ -41,8 +41,8 @@ RUN curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/p
 
 RUN pyenv install --debug 2.7.15
 RUN pyenv install 3.5.6
-RUN pyenv install 3.6.6
-RUN pyenv install --debug 3.7.0
+RUN pyenv install 3.6.7
+RUN pyenv install --debug 3.7.1
 RUN pyenv install pypy2.7-6.0.0
 RUN pyenv install pypy3.5-6.0.0
 
diff --git a/.gitlab-ci/Dockerfile.gtk4 b/.gitlab-ci/Dockerfile.gtk4
index 297a70d6..6420e668 100644
--- a/.gitlab-ci/Dockerfile.gtk4
+++ b/.gitlab-ci/Dockerfile.gtk4
@@ -1,4 +1,4 @@
-FROM registry.gitlab.gnome.org/gnome/pygobject/main:v8
+FROM registry.gitlab.gnome.org/gnome/pygobject/main:v9
 
 USER root
 
@@ -15,14 +15,6 @@ RUN apt-get update && apt-get install -y \
     wayland-protocols \
     && rm -rf /var/lib/apt/lists/*
 
-RUN git clone https://gitlab.freedesktop.org/wayland/wayland.git \
-    && cd wayland \
-    && git checkout 1.16.0 \
-    && ./autogen.sh --disable-documentation \
-    && make -j8 && make install \
-    && cd .. \
-    && rm -Rf wayland
-
 RUN git clone https://gitlab.gnome.org/GNOME/gtk.git \
     && cd gtk \
     && git checkout 833442e1e29e5 \
@@ -33,4 +25,4 @@ RUN git clone https://gitlab.gnome.org/GNOME/gtk.git \
     && rm -Rf gtk
 
 USER user
-ENV PYENV_VERSION 3.7.0-debug
+ENV PYENV_VERSION 3.7.1-debug
diff --git a/.gitlab-ci/run-docker-gtk4.sh b/.gitlab-ci/run-docker-gtk4.sh
index f6c979d0..8bd0a16e 100755
--- a/.gitlab-ci/run-docker-gtk4.sh
+++ b/.gitlab-ci/run-docker-gtk4.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-TAG="registry.gitlab.gnome.org/gnome/pygobject/gtk4:v1"
+TAG="registry.gitlab.gnome.org/gnome/pygobject/gtk4:v2"
 
 sudo docker build --tag "${TAG}" --file "Dockerfile.gtk4" .
 sudo docker run --rm --security-opt label=disable \
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index bcfd7075..fe0cfc42 100755
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -2,10 +2,10 @@
 
 set -e
 
-TAG="registry.gitlab.gnome.org/gnome/pygobject/main:v8"
+TAG="registry.gitlab.gnome.org/gnome/pygobject/main:v9"
 
 sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
     --file "Dockerfile" .
-sudo docker run -e PYENV_VERSION='3.7.0-debug' --rm --security-opt label=disable \
+sudo docker run -e PYENV_VERSION='3.7.1-debug' --rm --security-opt label=disable \
     --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
     --tty --interactive "${TAG}" bash