From 409d7e6651d8f18c5caa4905304526639aa14d1f Mon Sep 17 00:00:00 2001
From: Julian Rother <julian@cccv.de>
Date: Sun, 22 Oct 2023 22:31:01 +0200
Subject: [PATCH] Use Debian Bookworm for CI builds
- Fix apt package build on Bookworm
- Adapt babel.cfg to jinja 3.x.x and break compatability with older versions
---
.gitlab-ci.yml | 6 +++---
uffd/babel.cfg | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b11a4c23..9b95b44c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.git.cccv.de/uffd/docker-images/buster
+image: registry.git.cccv.de/uffd/docker-images/bookworm
variables:
DEBIAN_FRONTEND: noninteractive
@@ -13,7 +13,7 @@ before_script:
- uname -a
- python3 -m pylint --version
- python3 -m coverage --version
- - export UFFD_PACKAGE_VERSION="$(git describe | sed -E -n -e 's/^v([0-9.]*)$/\1/p' -e 's/^v([0-9.]*)-([0-9]*)-g([0-9a-z]*)$/\1.dev+git.\3/p' | grep .)"
+ - export PACKAGE_VERSION="$(git describe | sed -E -n -e 's/^v([0-9.]*)$/\1/p' -e 's/^v([0-9.]*)-([0-9]*)-g([0-9a-z]*)$/\1.dev+git.\3/p' | grep .)"
.build:
stage: build
@@ -21,7 +21,7 @@ before_script:
build:pip:
extends: .build
script:
- - PACKAGE_VERSION="${UFFD_PACKAGE_VERSION}" python3 -m build
+ - python3 -m build
artifacts:
paths:
- dist/*
diff --git a/uffd/babel.cfg b/uffd/babel.cfg
index f0234b32..759e805a 100644
--- a/uffd/babel.cfg
+++ b/uffd/babel.cfg
@@ -1,3 +1,2 @@
[python: **.py]
[jinja2: **/templates/**.html]
-extensions=jinja2.ext.autoescape,jinja2.ext.with_
--
GitLab