From 36dc79774142ebfc353b53a7fc20d98ef4e454a5 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Fri, 27 Jan 2023 16:13:26 +0100
Subject: CI: Add Python 3.11 and update other Python installs

---
 .gitlab-ci.yml           | 19 ++++++++++++-------
 .gitlab-ci/Dockerfile    | 12 +++++++-----
 .gitlab-ci/run-docker.sh |  4 ++--
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5148c018..634a5f4c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/pygobject/main:v18
+image: registry.gitlab.gnome.org/gnome/pygobject/main:v19
 
 stages:
   - build_and_test
@@ -35,7 +35,7 @@ coverage:
     paths:
       - coverage/
   variables:
-    PYENV_VERSION: "3.7.13-debug"
+    PYENV_VERSION: "3.8.16-debug"
   script:
     - bash -x ./.gitlab-ci/coverage-docker.sh
   coverage: '/^\s+lines\.+:\s+([\d.]+\%)\s+/'
@@ -65,28 +65,33 @@ mingw64:
 
 python3.7:
   variables:
-    PYENV_VERSION: "3.7.13-debug"
+    PYENV_VERSION: "3.7.16-debug"
   <<: *defaults
 
 python3.8:
   variables:
-    PYENV_VERSION: "3.8.13-debug"
+    PYENV_VERSION: "3.8.16-debug"
   <<: *defaults
 
 python3.9:
   variables:
-    PYENV_VERSION: "3.9.12-debug"
+    PYENV_VERSION: "3.9.16-debug"
   <<: *defaults
 
 python3.10:
   variables:
-    PYENV_VERSION: "3.10.4-debug"
+    PYENV_VERSION: "3.10.9-debug"
+  <<: *defaults
+
+python3.11:
+  variables:
+    PYENV_VERSION: "3.11.1-debug"
   <<: *defaults
 
 pypy3.8:
   allow_failure: true
   variables:
-    PYENV_VERSION: "pypy3.8-7.3.8"
+    PYENV_VERSION: "pypy3.8-7.3.11"
   <<: *defaults
 
 old-i386-py3:
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 9a950083..5883d913 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -20,6 +20,7 @@ RUN apt-get update && apt-get install -y \
     libreadline-dev \
     libsqlite3-dev \
     libssl-dev \
+    liblzma-dev \
     ninja-build \
     python3-pip \
     xauth \
@@ -41,10 +42,11 @@ ENV PYTHON_CONFIGURE_OPTS="--enable-shared"
 
 RUN curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash
 
-RUN pyenv install pypy3.8-7.3.8
-RUN pyenv install --debug 3.7.13
-RUN pyenv install --debug 3.8.13
-RUN pyenv install --debug 3.9.12
-RUN pyenv install --debug 3.10.4
+RUN pyenv install pypy3.8-7.3.11
+RUN pyenv install --debug 3.7.16
+RUN pyenv install --debug 3.8.16
+RUN pyenv install --debug 3.9.16
+RUN pyenv install --debug 3.10.9
+RUN pyenv install --debug 3.11.1
 
 ENV PATH="/usr/lib/ccache:${PATH}"
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index 5ad020e9..cf30c2d3 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:v18"
+TAG="registry.gitlab.gnome.org/gnome/pygobject/main:v19"
 
 sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
     --file "Dockerfile" .
-sudo docker run -e PYENV_VERSION='3.8.13-debug' --rm --security-opt label=disable \
+sudo docker run -e PYENV_VERSION='3.8.16-debug' --rm --security-opt label=disable \
     --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
     --tty --interactive "${TAG}" bash
-- 
cgit v1.2.1