From 7bad0359afe1e76382b6ffdaa54060f9aa40254c Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Thu, 21 Nov 2024 08:44:14 +0100 Subject: [PATCH] updated ci pipeline to match current eol supported systems --- .DEBIAN/requirements-ubuntu-23.04.txt | 10 ---------- .DEBIAN/requirements-ubuntu-23.10.txt | 10 ---------- .gitlab-ci.yml | 6 ++---- README.md | 10 +++++----- 4 files changed, 7 insertions(+), 29 deletions(-) delete mode 100644 .DEBIAN/requirements-ubuntu-23.04.txt delete mode 100644 .DEBIAN/requirements-ubuntu-23.10.txt diff --git a/.DEBIAN/requirements-ubuntu-23.04.txt b/.DEBIAN/requirements-ubuntu-23.04.txt deleted file mode 100644 index f2d4b05..0000000 --- a/.DEBIAN/requirements-ubuntu-23.04.txt +++ /dev/null @@ -1,10 +0,0 @@ -# https://packages.ubuntu.com -fastapi==0.91.0 -uvicorn[standard]==0.15.0 -python-jose[pycryptodome]==3.3.0 -pycryptodome==3.11.0 -python-dateutil==2.8.2 -sqlalchemy==1.4.46 -markdown==3.4.3 -python-dotenv==0.21.0 -jinja2==3.1.2 diff --git a/.DEBIAN/requirements-ubuntu-23.10.txt b/.DEBIAN/requirements-ubuntu-23.10.txt deleted file mode 100644 index 4cab03f..0000000 --- a/.DEBIAN/requirements-ubuntu-23.10.txt +++ /dev/null @@ -1,10 +0,0 @@ -# https://packages.ubuntu.com -fastapi==0.101.0 -uvicorn[standard]==0.23.2 -python-jose[pycryptodome]==3.3.0 -pycryptodome==3.11.0 -python-dateutil==2.8.2 -sqlalchemy==1.4.47 -markdown==3.4.4 -python-dotenv==1.0.0 -jinja2==3.1.2 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f2e3b9b..a8aa3bd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -144,11 +144,9 @@ test: matrix: - IMAGE: [ 'python:3.12-slim-bookworm' ] REQUIREMENTS: [ 'requirements.txt' ] - - IMAGE: [ 'debian:bookworm' ] + - IMAGE: [ 'debian:bookworm' ] # EOL: June 06, 2026 REQUIREMENTS: [ '.DEBIAN/requirements-bookworm-12.txt' ] - - IMAGE: [ 'ubuntu:23.10' ] - REQUIREMENTS: [ '.DEBIAN/requirements-ubuntu-23.10.txt' ] - - IMAGE: [ 'ubuntu:24.04' ] + - IMAGE: [ 'ubuntu:24.04' ] # EOL: April 2036 REQUIREMENTS: [ '.DEBIAN/requirements-ubuntu-24.04.txt' ] - IMAGE: [ 'ubuntu:24.10' ] REQUIREMENTS: [ '.DEBIAN/requirements-ubuntu-24.10.txt' ] diff --git a/README.md b/README.md index 9cde329..8d14c53 100644 --- a/README.md +++ b/README.md @@ -330,11 +330,11 @@ Packages are available here: Successful tested with: -- Debian 12 (Bookworm) (EOL: tba.) -- Ubuntu 22.10 (Kinetic Kudu) (EOL: July 20, 2023) -- Ubuntu 23.04 (Lunar Lobster) (EOL: January 2024) -- Ubuntu 23.10 (Mantic Minotaur) (EOL: July 2024) -- Ubuntu 24.04 (Noble Numbat) (EOL: April 2036) +- **Debian 12 (Bookworm)** (EOL: June 06, 2026) +- *Ubuntu 22.10 (Kinetic Kudu)* (EOL: July 20, 2023) +- *Ubuntu 23.04 (Lunar Lobster)* (EOL: January 2024) +- *Ubuntu 23.10 (Mantic Minotaur)* (EOL: July 2024) +- **Ubuntu 24.04 (Noble Numbat)** (EOL: April 2036) Not working with: