From dcd3721a146797969d8582a0fd231bd57be62bf6 Mon Sep 17 00:00:00 2001
From: Moul <moul@moul.re>
Date: Tue, 3 Oct 2023 18:44:23 +0200
Subject: [PATCH] CI: Switch default Python version to 3.12 (#448)
Move coverage and integration testing to v3.12 job
Remove allow_failure
Switch image creation to Py3.12
---
.gitlab-ci.yml | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d82d76cd..17cd4293 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ stages:
variables:
DOCKER_IMAGE: "registry.duniter.org/docker/python3/poetry"
- PYTHON_VERSION: "3.11"
+ PYTHON_VERSION: "3.12"
image: $DOCKER_IMAGE/$PYTHON_VERSION:latest
@@ -110,7 +110,12 @@ unit_tests:3.10:
variables:
PYTHON_VERSION: "3.10"
-tests:3.11:cov:
+unit_tests:3.11:
+ extends: .tests
+ variables:
+ PYTHON_VERSION: "3.11"
+
+tests:3.12:cov:
extends: .tests
coverage: '/(?i)total.*\s+(\d+%)/'
script:
@@ -126,12 +131,6 @@ tests:3.11:cov:
coverage_format: cobertura
path: coverage.xml
-unit_tests:3.12:
- extends: .tests
- variables:
- PYTHON_VERSION: "3.12"
- allow_failure: true
-
.image:
stage: package
tags: [docker]
@@ -139,7 +138,7 @@ unit_tests:3.12:
services:
- docker:dind
variables:
- PYTHON_VERSION: "3.11"
+ PYTHON_VERSION: "3.12"
script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- docker build --pull -t "$CI_REGISTRY_IMAGE/$CHANNEL/$ENV:$CI_COMMIT_SHORT_SHA" -f image/$ENV --build-arg PYTHON_VERS=$PYTHON_VERSION .
--
GitLab