drop focal builds and start building rec-5.2.x instead of rec-4.9.x

diff --git a/.github/workflows/build-and-test-all-releases-dispatch.yml b/.github/workflows/build-and-test-all-releases-dispatch.yml
index 32fad390f29e316fe09bde502747e835d8aa8986..ea2ef3a9d3a9a2521f491760a8e08e9d81df12b7 100644 (file)
--- a/.github/workflows/build-and-test-all-releases-dispatch.yml
+++ b/.github/workflows/build-and-test-all-releases-dispatch.yml
@@ -36,6 +36,12 @@ jobs:
     with:
       branch-name: rel/auth-4.7.x
 
+  call-build-and-test-all-rec-52:
+    if: ${{ vars.SCHEDULED_JOBS_BUILD_AND_TEST_ALL }}
+    uses: PowerDNS/pdns/.github/workflows/build-and-test-all.yml@rel/rec-5.2.x
+    with:
+      branch-name: rel/rec-5.2.x
+
   call-build-and-test-all-rec-51:
     if: ${{ vars.SCHEDULED_JOBS_BUILD_AND_TEST_ALL }}
     uses: PowerDNS/pdns/.github/workflows/build-and-test-all.yml@rel/rec-5.1.x
@@ -48,12 +54,6 @@ jobs:
     with:
       branch-name: rel/rec-5.0.x
 
-  call-build-and-test-all-rec-49:
-    if: ${{ vars.SCHEDULED_JOBS_BUILD_AND_TEST_ALL }}
-    uses: PowerDNS/pdns/.github/workflows/build-and-test-all.yml@rel/rec-4.9.x
-    with:
-      branch-name: rel/rec-4.9.x
-
   call-build-and-test-all-dnsdist-19:
     if: ${{ vars.SCHEDULED_JOBS_BUILD_AND_TEST_ALL }}
     uses: PowerDNS/pdns/.github/workflows/build-and-test-all.yml@rel/dnsdist-1.9.x

diff --git a/.github/workflows/builder-dispatch.yml b/.github/workflows/builder-dispatch.yml
index fe57f661a8e53016357f5a6f7dc4f2e68f3cc4f1..83a9f82412efc898b4df95d4b1d80b25a98b17b5 100644 (file)
--- a/.github/workflows/builder-dispatch.yml
+++ b/.github/workflows/builder-dispatch.yml
@@ -20,7 +20,6 @@ on:
           el-9
           debian-bullseye
           debian-bookworm
-          ubuntu-focal
           ubuntu-jammy
           ubuntu-noble
       ref:

diff --git a/.github/workflows/builder-releases-dispatch.yml b/.github/workflows/builder-releases-dispatch.yml
index e18e69db5e3bb1b5dffab4f3ba0635f961d9e46a..54b057e0e4a8e82fd0b34302c08b901294bb9ec7 100644 (file)
--- a/.github/workflows/builder-releases-dispatch.yml
+++ b/.github/workflows/builder-releases-dispatch.yml
@@ -29,6 +29,12 @@ jobs:
     with:
       branch-name: rel/auth-4.7.x
 
+  call-builder-rec-52:
+    if: ${{ vars.SCHEDULED_JOBS_BUILDER }}
+    uses: PowerDNS/pdns/.github/workflows/builder.yml@rel/rec-5.2.x
+    with:
+      branch-name: rel/rec-5.2.x
+
   call-builder-rec-51:
     if: ${{ vars.SCHEDULED_JOBS_BUILDER }}
     uses: PowerDNS/pdns/.github/workflows/builder.yml@rel/rec-5.1.x
@@ -41,12 +47,6 @@ jobs:
     with:
       branch-name: rel/rec-5.0.x
 
-  call-builder-rec-49:
-    if: ${{ vars.SCHEDULED_JOBS_BUILDER }}
-    uses: PowerDNS/pdns/.github/workflows/builder.yml@rel/rec-4.9.x
-    with:
-      branch-name: rel/rec-4.9.x
-
   call-builder-dnsdist-19:
     if: ${{ vars.SCHEDULED_JOBS_BUILDER }}
     uses: PowerDNS/pdns/.github/workflows/builder.yml@rel/dnsdist-1.9.x

diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-focal b/builder-support/dockerfiles/Dockerfile.target.ubuntu-focal
deleted file mode 100644 (file)
index 110eebd..0000000
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-focal
+++ /dev/null
@@ -1,28 +0,0 @@
-# First do the source builds
-@INCLUDE Dockerfile.target.sdist
-
-FROM ubuntu:focal 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-bullseye/ 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