From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Tue, 19 Aug 2025 07:34:59 +0000 (+0200)
Subject: drop ubuntu oracular, it is EOL
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F15988%2Fhead;p=thirdparty%2Fpdns.git

drop ubuntu oracular, it is EOL
---

diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index 37b0e8eb7..8cd416ced 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -37,7 +37,6 @@ jobs:
         os:
           - centos-9-stream
           - centos-10-stream
-          - ubuntu-oracular
           - amazon-2023
         runner-os: ${{ fromJson(needs.prepare.outputs.runnerlist )}}
       fail-fast: false
diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-oracular b/builder-support/dockerfiles/Dockerfile.target.ubuntu-oracular
deleted file mode 100644
index 57683c579..000000000
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-oracular
+++ /dev/null
@@ -1,30 +0,0 @@
-# First do the source builds
-@INCLUDE Dockerfile.target.sdist
-
-FROM ubuntu:oracular AS dist-base
-
-ARG BUILDER_CACHE_BUSTER=
-ARG APT_URL
-RUN apt-get update && apt-get -y dist-upgrade
-# FIXME: Package usrmerge missing sha256 str
-RUN apt-get purge -y usrmerge
-
-@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-trixie / 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