Merge branch 'dev' into ui

# Conflicts:
#	app/orm.py

.gitlab-ci.yml

@@ -98,7 +98,7 @@ build:pacman:
       - "*.pkg.tar.zst"
 
 test:
-  image: python:3.10-slim-bullseye
+  image: python:3.11-slim-bullseye
   stage: test
   rules:
     - if: $CI_COMMIT_BRANCH
@@ -114,6 +114,9 @@ test:
     - cd test
   script:
     - pytest main.py
+  artifacts:
+    reports:
+      dotenv: version.env
 
 .test:linux:
   stage: test
@@ -272,24 +275,11 @@ deploy:pacman:
     - 'echo "EXPORT_NAME:     ${EXPORT_NAME}"'
     - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ${EXPORT_NAME} "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${PACKAGE_NAME}/${PACKAGE_VERSION}/${EXPORT_NAME}"'
 
-release:prepare:
-  stage: .pre
-  rules:
-    - if: $CI_COMMIT_TAG
-      when: never
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-  script:
-    - source version.env
-    - echo $VERSION
-  artifacts:
-    reports:
-      dotenv: version.env
-
 release:
   image: registry.gitlab.com/gitlab-org/release-cli:latest
   stage: .post
   needs:
-    - job: release:prepare
+    - job: test
       artifacts: true
   rules:
     - if: $CI_COMMIT_TAG
@@ -298,7 +288,7 @@ release:
   script:
     - echo "Running release-job for $VERSION"
   release:
-    name: $CI_PROJECT_TITLE $version
+    name: $CI_PROJECT_TITLE $VERSION
     description: Release of $CI_PROJECT_TITLE version $VERSION
     tag_name: $VERSION
     ref: $CI_COMMIT_SHA