From a0347d8446eb937a36d02d7c905f0d56dce8ff8f Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sun, 19 Sep 2021 12:50:59 +0200
Subject: CI: Update all Python versions and add 3.10

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de9d9b0b..81864207 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/pygobject/main:v15
+image: registry.gitlab.gnome.org/gnome/pygobject/main:v16
 
 stages:
   - build_and_test
@@ -35,7 +35,7 @@ coverage:
     paths:
       - coverage/
   variables:
-    PYENV_VERSION: "3.6.12"
+    PYENV_VERSION: "3.7.11-debug"
   script:
     - bash -x ./.gitlab-ci/coverage-docker.sh
 
@@ -64,28 +64,33 @@ mingw64:
 
 python3.6:
   variables:
-    PYENV_VERSION: "3.6.12"
+    PYENV_VERSION: "3.6.14"
   <<: *defaults
 
 python3.7:
   variables:
-    PYENV_VERSION: "3.7.9-debug"
+    PYENV_VERSION: "3.7.11-debug"
   <<: *defaults
 
 python3.8:
   variables:
-    PYENV_VERSION: "3.8.5-debug"
+    PYENV_VERSION: "3.8.12-debug"
   <<: *defaults
 
 python3.9:
   variables:
-    PYENV_VERSION: "3.9.0-debug"
+    PYENV_VERSION: "3.9.7-debug"
   <<: *defaults
 
-pypy3.6:
+python3.10:
+  variables:
+    PYENV_VERSION: "3.10.0rc2-debug"
+  <<: *defaults
+
+pypy3.7:
   allow_failure: true
   variables:
-    PYENV_VERSION: "pypy3.6-7.3.1"
+    PYENV_VERSION: "pypy3.7-7.3.5"
   <<: *defaults
 
 old-i386-py3:
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index c2f1c652..e10aaa97 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -41,10 +41,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.6-7.3.1
-RUN pyenv install 3.6.12
-RUN pyenv install --debug 3.7.9
-RUN pyenv install --debug 3.8.5
-RUN pyenv install --debug 3.9.0
+RUN pyenv install pypy3.7-7.3.5
+RUN pyenv install 3.6.14
+RUN pyenv install --debug 3.7.11
+RUN pyenv install --debug 3.8.12
+RUN pyenv install --debug 3.9.7
+RUN pyenv install --debug 3.10.0rc2
 
 ENV PATH="/usr/lib/ccache:${PATH}"
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index 8b7d24df..48c3036f 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:v15"
+TAG="registry.gitlab.gnome.org/gnome/pygobject/main:v16"
 
 sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
     --file "Dockerfile" .
-sudo docker run -e PYENV_VERSION='3.8.5-debug' --rm --security-opt label=disable \
+sudo docker run -e PYENV_VERSION='3.8.12-debug' --rm --security-opt label=disable \
     --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
     --tty --interactive "${TAG}" bash
-- 
cgit v1.2.1