From: Peter van Dijk Date: Fri, 22 Nov 2024 09:08:40 +0000 (+0100) Subject: builder: remove ubuntu lunar+mantic as they are EOL X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85cfdbac7177b34bc4b570c27301454b1bc98d1b;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 1d88da6d94..890fa4138e 100644 --- a/.github/workflows/builder.yml +++ b/.github/workflows/builder.yml @@ -30,7 +30,6 @@ jobs: - el-8 - centos-9-stream - ubuntu-jammy - - ubuntu-lunar - debian-bookworm - amazon-2023 fail-fast: false diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar b/builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar deleted file mode 100644 index ce71c39c03..0000000000 --- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar +++ /dev/null @@ -1,36 +0,0 @@ -# First do the source builds -@INCLUDE Dockerfile.target.sdist - -@IF [ ${BUILDER_TARGET} = ubuntu-lunar ] -FROM ubuntu:lunar as dist-base -@ENDIF -@IF [ ${BUILDER_TARGET} = ubuntu-lunar-amd64 ] -FROM amd64/ubuntu:lunar as dist-base -@ENDIF -@IF [ ${BUILDER_TARGET} = ubuntu-lunar-arm64 ] -FROM arm64v8/ubuntu:lunar as dist-base -@ENDIF - -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-lunar-amd64 b/builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar-amd64 deleted file mode 120000 index 5ab4dd2441..0000000000 --- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar-amd64 +++ /dev/null @@ -1 +0,0 @@ -Dockerfile.target.ubuntu-lunar \ No newline at end of file diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar-arm64 b/builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar-arm64 deleted file mode 120000 index 5ab4dd2441..0000000000 --- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar-arm64 +++ /dev/null @@ -1 +0,0 @@ -Dockerfile.target.ubuntu-lunar \ No newline at end of file