From c541227dd3093d29869171412a408f49959c08a6 Mon Sep 17 00:00:00 2001 From: Alex Pyrgiotis Date: Wed, 26 Jul 2023 13:48:17 +0300 Subject: [PATCH] Drop Ubuntu 22.10 (Kinetic Kudu) support Drop support for Ubuntu 22.10 (Kinetic Kudu), because it's past its EOL date [1]. Closes #485 [1]: https://endoflife.date/ubuntu --- .circleci/config.yml | 45 ---------------------------------------- .github/workflows/ci.yml | 3 --- CHANGELOG.md | 1 + INSTALL.md | 1 - dev_scripts/qa.py | 5 ----- 5 files changed, 1 insertion(+), 54 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 05f084a..ebffe84 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -181,33 +181,6 @@ jobs: ./dev_scripts/env.py --distro ubuntu --version 23.04 run -g --dev \ bash -c 'cd dangerzone; poetry run make test' - ci-ubuntu-kinetic: - machine: - image: ubuntu-2004:202111-01 - steps: - - checkout - - run: *install-podman - - - run: - name: Prepare cache directory - command: | - sudo mkdir -p /caches - sudo chown -R $USER:$USER /caches - - run: *calculate-cache-key - - restore_cache: *restore-cache - - run: *copy-image - - - run: - name: Prepare Dangerzone environment - command: | - ./dev_scripts/env.py --distro ubuntu --version 22.10 build-dev - - - run: - name: Run CI tests - command: | - ./dev_scripts/env.py --distro ubuntu --version 22.10 run -g --dev \ - bash -c 'cd dangerzone; poetry run make test' - ci-ubuntu-jammy: machine: image: ubuntu-2004:202111-01 @@ -442,18 +415,6 @@ jobs: - run: *copy-image - run: *build-deb - build-ubuntu-kinetic: - docker: - - image: ubuntu:22.10 - resource_class: medium+ - steps: - - run: *install-dependencies-deb - - checkout - - run: *calculate-cache-key - - restore_cache: *restore-cache - - run: *copy-image - - run: *build-deb - build-ubuntu-jammy: docker: - image: ubuntu:22.04 @@ -552,9 +513,6 @@ workflows: - ci-ubuntu-lunar: requires: - build-container-image - - ci-ubuntu-kinetic: - requires: - - build-container-image - ci-ubuntu-jammy: requires: - build-container-image @@ -579,9 +537,6 @@ workflows: - build-ubuntu-lunar: requires: - build-container-image - - build-ubuntu-kinetic: - requires: - - build-container-image - build-ubuntu-jammy: requires: - build-container-image diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 934e6c2..011477d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -89,9 +89,6 @@ jobs: - target: ubuntu-22.04 distro: ubuntu version: "22.04" - - target: ubuntu-22.10 - distro: ubuntu - version: "22.10" - target: ubuntu-23.04 distro: ubuntu version: "23.04" diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f4f9a8..f615ac4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ since 0.4.1, and this project adheres to [Semantic Versioning](https://semver.or ### Removed - Platform support: Drop Fedora 36, since it's end-of-life ([issue #420](https://github.com/freedomofpress/dangerzone/issues/420)) +- Platform support: Drop Ubuntu 22.10 (Kinetic Kudu), since it's end-of-life ([issue #485](https://github.com/freedomofpress/dangerzone/issues/485)) ### Fixed diff --git a/INSTALL.md b/INSTALL.md index 6fefbe0..1e0a42c 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,7 +1,6 @@ Dangerzone is available for: - Ubuntu 23.04 (lunar) -- Ubuntu 22.10 (kinetic) - Ubuntu 22.04 (jammy) - Ubuntu 20.04 (focal) - Debian 13 (trixie) diff --git a/dev_scripts/qa.py b/dev_scripts/qa.py index e1970c4..8c2281f 100755 --- a/dev_scripts/qa.py +++ b/dev_scripts/qa.py @@ -812,11 +812,6 @@ class QAUbuntu2204(QADebianBased): VERSION = "22.04" -class QAUbuntu2210(QADebianBased): - DISTRO = "ubuntu" - VERSION = "22.10" - - class QAUbuntu2304(QADebianBased): DISTRO = "ubuntu" VERSION = "23.04"