From 59e1666c280942a33bba76977ea052ee47e2c8c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= Date: Wed, 30 Oct 2024 01:46:22 +0100 Subject: [PATCH] Drop support for Ubuntu Mantic (23.10), which is EOL since 11 Jul 2024. --- .github/workflows/build.yml | 2 -- .github/workflows/check_repos.yml | 2 -- .github/workflows/ci.yml | 6 ------ INSTALL.md | 1 - dev_scripts/env.py | 4 ---- dev_scripts/qa.py | 5 ----- 6 files changed, 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 64c5d55..6d210b3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,8 +33,6 @@ jobs: version: "20.04" - distro: ubuntu version: "22.04" - - distro: ubuntu - version: "23.10" - distro: ubuntu version: "24.04" - distro: ubuntu diff --git a/.github/workflows/check_repos.yml b/.github/workflows/check_repos.yml index 2e11d71..db33f9a 100644 --- a/.github/workflows/check_repos.yml +++ b/.github/workflows/check_repos.yml @@ -23,8 +23,6 @@ jobs: version: "24.10" # oracular - distro: ubuntu version: "24.04" # noble - - distro: ubuntu - version: "23.10" # mantic - distro: ubuntu version: "22.04" # jammy - distro: ubuntu diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca94580..768794c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -159,8 +159,6 @@ jobs: version: "20.04" - distro: ubuntu version: "22.04" - - distro: ubuntu - version: "23.10" - distro: ubuntu version: "24.04" - distro: ubuntu @@ -229,8 +227,6 @@ jobs: version: "20.04" - distro: ubuntu version: "22.04" - - distro: ubuntu - version: "23.10" - distro: ubuntu version: "24.04" - distro: ubuntu @@ -350,8 +346,6 @@ jobs: version: "20.04" - distro: ubuntu version: "22.04" - - distro: ubuntu - version: "23.10" - distro: ubuntu version: "24.04" - distro: ubuntu diff --git a/INSTALL.md b/INSTALL.md index 2d715ae..5e14c5f 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -11,7 +11,6 @@ an isolated environment. It will be installed automatically when installing Dang Dangerzone is available for: - Ubuntu 24.10 (oracular) - Ubuntu 24.04 (noble) -- Ubuntu 23.10 (mantic) - Ubuntu 22.04 (jammy) - Ubuntu 20.04 (focal) - Debian 13 (trixie) diff --git a/dev_scripts/env.py b/dev_scripts/env.py index 210fd72..8fb2a8e 100755 --- a/dev_scripts/env.py +++ b/dev_scripts/env.py @@ -696,8 +696,6 @@ class Env: DOCKERFILE_CONMON_UPDATE + DOCKERFILE_BUILD_DEV_DEBIAN_DEPS ) elif self.distro == "ubuntu" and self.version in ( - "23.10", - "mantic", "24.04", "noble", "24.10", @@ -784,8 +782,6 @@ class Env: # package (see https://github.com/freedomofpress/dangerzone/issues/685) install_deps = DOCKERFILE_CONMON_UPDATE + DOCKERFILE_BUILD_DEBIAN_DEPS elif self.distro == "ubuntu" and self.version in ( - "23.10", - "mantic", "24.04", "noble", "24.10", diff --git a/dev_scripts/qa.py b/dev_scripts/qa.py index 5790e29..8bc95b7 100755 --- a/dev_scripts/qa.py +++ b/dev_scripts/qa.py @@ -978,11 +978,6 @@ class QAUbuntu2204(QADebianBased): VERSION = "22.04" -class QAUbuntu2310(QADebianBased): - DISTRO = "ubuntu" - VERSION = "23.10" - - class QAUbuntu2404(QADebianBased): DISTRO = "ubuntu" VERSION = "24.04"