Skip to content

Commit 0761b4d

Browse files
authored
Merge pull request #1200 from thaJeztah/remove_ubuntu_20.04
deb: remove ubuntu 20.04 "focal", as it reached EOL
2 parents a4107ac + a69db2e commit 0761b4d

File tree

6 files changed

+3
-51
lines changed

6 files changed

+3
-51
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ jobs:
3434
- debian-bullseye
3535
- debian-bookworm
3636
- debian-trixie
37-
- ubuntu-focal
3837
- ubuntu-jammy
3938
- ubuntu-noble
4039
- ubuntu-oracular

Jenkinsfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ def pkgs = [
1212
[target: "fedora-42", image: "fedora:42", arches: ["amd64", "aarch64"]], // EOL: May 13, 2026
1313
[target: "raspbian-bullseye", image: "balenalib/rpi-raspbian:bullseye", arches: ["armhf"]], // Debian/Raspbian 11 (stable)
1414
[target: "raspbian-bookworm", image: "balenalib/rpi-raspbian:bookworm", arches: ["armhf"]], // Debian/Raspbian 12 (next stable)
15-
[target: "ubuntu-focal", image: "ubuntu:focal", arches: ["amd64", "aarch64", "armhf"]], // Ubuntu 20.04 LTS (End of support: April, 2025. EOL: April, 2030)
1615
[target: "ubuntu-jammy", image: "ubuntu:jammy", arches: ["amd64", "aarch64", "armhf"]], // Ubuntu 22.04 LTS (End of support: June, 2027. EOL: April, 2032)
1716
[target: "ubuntu-noble", image: "ubuntu:noble", arches: ["amd64", "aarch64", "armhf"]], // Ubuntu 24.04 LTS (End of support: June, 2029. EOL: April, 2034)
1817
[target: "ubuntu-oracular", image: "ubuntu:oracular", arches: ["amd64", "aarch64", "armhf"]], // Ubuntu 24.10 (EOL: July, 2025)

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ static: checkout ## build static-compiled packages
9999

100100
.PHONY: verify
101101
verify: ## verify installation of packages
102-
# to verify using packages from staging, use: make VERIFY_PACKAGE_REPO=stage IMAGE=ubuntu:focal verify
102+
# to verify using packages from staging, use: make VERIFY_PACKAGE_REPO=stage IMAGE=ubuntu:noble verify
103103
docker run $(VERIFY_PLATFORM) --rm -i \
104104
-v "$$(pwd):/v" \
105105
-e DEBIAN_FRONTEND=noninteractive \

deb/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ RUN?=docker run --rm \
5454
debbuild-$@/$(ARCH)
5555

5656
DEBIAN_VERSIONS ?= debian-bullseye debian-bookworm debian-trixie
57-
UBUNTU_VERSIONS ?= ubuntu-focal ubuntu-jammy ubuntu-noble ubuntu-oracular ubuntu-plucky
57+
UBUNTU_VERSIONS ?= ubuntu-jammy ubuntu-noble ubuntu-oracular ubuntu-plucky
5858
RASPBIAN_VERSIONS ?= raspbian-bullseye raspbian-bookworm
5959
DISTROS := $(DEBIAN_VERSIONS) $(UBUNTU_VERSIONS) $(RASPBIAN_VERSIONS)
6060

deb/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ make ubuntu
2929

3030
## Specifying a specific distro version
3131
```shell
32-
make ubuntu-focal
32+
make ubuntu-noble
3333
```
3434

3535
## Building the for all distros

deb/ubuntu-focal/Dockerfile

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)