From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 22 Nov 2024 09:08:40 +0000 (+0100)
Subject: builder: remove ubuntu lunar+mantic as they are EOL
X-Git-Tag: rec-5.1.4~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f266f598d45256bba6c63f68001f97ff7b9353dc;p=thirdparty%2Fpdns.git

builder: remove ubuntu lunar+mantic as they are EOL
---

diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index 73b0517a0d..2e3fc4fbab 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -27,8 +27,6 @@ jobs:
           - el-7
           - el-8
           - centos-9-stream
-          - ubuntu-lunar
-          - ubuntu-mantic
           - ubuntu-noble
           - debian-bookworm
           - debian-trixie
diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar b/builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar
deleted file mode 100644
index c3c3c4d8ec..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar
+++ /dev/null
@@ -1,28 +0,0 @@
-# First do the source builds
-@INCLUDE Dockerfile.target.sdist
-
-FROM ubuntu:lunar as dist-base
-
-ARG BUILDER_CACHE_BUSTER=
-ARG APT_URL
-RUN apt-get update && apt-get -y dist-upgrade
-
-@INCLUDE Dockerfile.debbuild-prepare
-
-@IF [ -n "$M_authoritative$M_all" ]
-ADD builder-support/debian/authoritative/debian-buster/ pdns-${BUILDER_VERSION}/debian/
-@ENDIF
-
-@IF [ -n "$M_recursor$M_all" ]
-ADD builder-support/debian/recursor/debian-buster/ pdns-recursor-${BUILDER_VERSION}/debian/
-@ENDIF
-
-@IF [ -n "$M_dnsdist$M_all" ]
-ADD builder-support/debian/dnsdist/debian-buster/ dnsdist-${BUILDER_VERSION}/debian/
-@ENDIF
-
-@INCLUDE Dockerfile.debbuild
-
-# Do a test install and verify
-# Can be skipped with skiptests=1 in the environment
-# @EXEC [ "$skiptests" = "" ] && include Dockerfile.debtest
diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-mantic b/builder-support/dockerfiles/Dockerfile.target.ubuntu-mantic
deleted file mode 100644
index 21639a4afd..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-mantic
+++ /dev/null
@@ -1,28 +0,0 @@
-# First do the source builds
-@INCLUDE Dockerfile.target.sdist
-
-FROM ubuntu:mantic as dist-base
-
-ARG BUILDER_CACHE_BUSTER=
-ARG APT_URL
-RUN apt-get update && apt-get -y dist-upgrade
-
-@INCLUDE Dockerfile.debbuild-prepare
-
-@IF [ -n "$M_authoritative$M_all" ]
-ADD builder-support/debian/authoritative/debian-buster/ pdns-${BUILDER_VERSION}/debian/
-@ENDIF
-
-@IF [ -n "$M_recursor$M_all" ]
-ADD builder-support/debian/recursor/debian-buster/ pdns-recursor-${BUILDER_VERSION}/debian/
-@ENDIF
-
-@IF [ -n "$M_dnsdist$M_all" ]
-ADD builder-support/debian/dnsdist/debian-bookworm/ dnsdist-${BUILDER_VERSION}/debian/
-@ENDIF
-
-@INCLUDE Dockerfile.debbuild
-
-# Do a test install and verify
-# Can be skipped with skiptests=1 in the environment
-# @EXEC [ "$skiptests" = "" ] && include Dockerfile.debtest