Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecate Ubuntu Lunar Lobster (EOL) #706

Merged
merged 1 commit into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 0 additions & 45 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -192,33 +192,6 @@ jobs:
./dev_scripts/env.py --distro ubuntu --version 23.10 run --dev \
bash -c 'cd dangerzone; poetry run make test'

ci-ubuntu-lunar:
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 23.04 build-dev

- run:
name: Run CI tests
command: |
./dev_scripts/env.py --distro ubuntu --version 23.04 run --dev \
bash -c 'cd dangerzone; poetry run make test'

ci-ubuntu-jammy:
machine:
image: ubuntu-2004:202111-01
Expand Down Expand Up @@ -453,18 +426,6 @@ jobs:
- run: *copy-image
- run: *build-deb

build-ubuntu-lunar:
docker:
- image: ubuntu:23.04
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
Expand Down Expand Up @@ -566,9 +527,6 @@ workflows:
- ci-ubuntu-mantic:
requires:
- build-container-image
- ci-ubuntu-lunar:
requires:
- build-container-image
- ci-ubuntu-jammy:
requires:
- build-container-image
Expand All @@ -593,9 +551,6 @@ workflows:
- build-ubuntu-mantic:
requires:
- build-container-image
- build-ubuntu-lunar:
requires:
- build-container-image
- build-ubuntu-jammy:
requires:
- build-container-image
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/check_repos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ jobs:
include:
- distro: ubuntu
version: "23.10" # mantic
- distro: ubuntu
version: "23.04" # lunar
- distro: ubuntu
version: "22.04" # jammy
- distro: ubuntu
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,6 @@ jobs:
- target: ubuntu-22.04
distro: ubuntu
version: "22.04"
- target: ubuntu-23.04
distro: ubuntu
version: "23.04"
- target: ubuntu-23.10
distro: ubuntu
version: "23.10"
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ since 0.4.1, and this project adheres to [Semantic Versioning](https://semver.or
### Removed

- Removed timeouts ([issue #687](https://github.com/freedomofpress/dangerzone/issues/687))
- Platform support: Drop Ubuntu 23.04 (Lunar Lobster), since it's end-of-life ([issue #705](https://github.com/freedomofpress/dangerzone/issues/705))

## Dangerzone 0.5.1

Expand Down
1 change: 0 additions & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ an isolated environment. It will be installed automatically when installing Dang

Dangerzone is available for:
- Ubuntu 23.10 (mantic)
- Ubuntu 23.04 (lunar)
- Ubuntu 22.04 (jammy)
- Ubuntu 20.04 (focal)
- Debian 13 (trixie)
Expand Down
4 changes: 0 additions & 4 deletions dev_scripts/env.py
Original file line number Diff line number Diff line change
Expand Up @@ -574,9 +574,7 @@ def build_dev(self, show_dockerfile=DEFAULT_SHOW_DOCKERFILE):
DOCKERFILE_CONMON_UPDATE + DOCKERFILE_BUILD_DEV_DEBIAN_DEPS
)
elif self.distro == "ubuntu" and self.version in (
"23.04",
"23.10",
"lunar",
"mantic",
):
install_deps = (
Expand Down Expand Up @@ -662,9 +660,7 @@ def build(
# 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.04",
"23.10",
"lunar",
"mantic",
):
install_deps = DOCKERFILE_UBUNTU_REM_USER + DOCKERFILE_BUILD_DEBIAN_DEPS
Expand Down
5 changes: 0 additions & 5 deletions dev_scripts/qa.py
Original file line number Diff line number Diff line change
Expand Up @@ -887,11 +887,6 @@ class QAUbuntu2204(QADebianBased):
VERSION = "22.04"


class QAUbuntu2304(QADebianBased):
DISTRO = "ubuntu"
VERSION = "23.04"


class QAUbuntu2310(QADebianBased):
DISTRO = "ubuntu"
VERSION = "23.10"
Expand Down
Loading