From d8c0e6ae3223085379f18164f9e102f7c3eea58a Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Wed, 16 Aug 2023 12:46:39 +0100
Subject: [PATCH] CI: Use Ubuntu 22.04 'jammy' to test Python 3.10
python3.10 was removed from Debian bookworm before it was released as
Debian 12.
Signed-off-by: Simon McVittie <smcv@collabora.com>
---
.gitlab-ci.yml | 10 ++++++----
tools/ci-install.sh | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9a02b89..102f1d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -84,18 +84,20 @@ build:python3.9-dbg:
build:python3.10:
stage: build
- image: "debian:bookworm-slim"
+ image: "ubuntu:jammy"
variables:
- ci_suite: bookworm
+ ci_distro: ubuntu
+ ci_suite: jammy
dbus_ci_system_python: python3.10
script: *script
artifacts: *artifacts
build:python3.10-dbg:
stage: build
- image: "debian:bookworm-slim"
+ image: "ubuntu:jammy"
variables:
- ci_suite: bookworm
+ ci_distro: ubuntu
+ ci_suite: jammy
dbus_ci_system_python: python3.10-dbg
dbus_ci_system_python_module_suffix: -dbg
script: *script
diff --git a/tools/ci-install.sh b/tools/ci-install.sh
index 59f9894..03ec19b 100755
--- a/tools/ci-install.sh
+++ b/tools/ci-install.sh
@@ -134,7 +134,7 @@ case "$ci_distro" in
# Needed for distcheck
case "$ci_suite" in
- (buster|focal|bullseye)
+ (buster|focal|bullseye|jammy)
"${dbus_ci_system_python-python3}" -m pip install --user \
pyproject_metadata \
tomli \
--
GitLab