From 2248618d76053b88ab65258a9bb57e7f4d225c1e Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 11 Jun 2024 22:54:34 +0200 Subject: [PATCH] remove Fedora 38 as it's EOL Signed-off-by: Sebastiaan van Stijn --- Jenkinsfile | 1 - rpm/Makefile | 2 +- rpm/fedora-38/Dockerfile | 26 -------------------------- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 rpm/fedora-38/Dockerfile diff --git a/Jenkinsfile b/Jenkinsfile index e28c6df018..e044ee4262 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,6 @@ def pkgs = [ [target: "debian-buster", image: "debian:buster", arches: ["amd64", "aarch64", "armhf"]], // Debian 10 (EOL: 2024) [target: "debian-bullseye", image: "debian:bullseye", arches: ["amd64", "aarch64", "armhf"]], // Debian 11 (stable) [target: "debian-bookworm", image: "debian:bookworm", arches: ["amd64", "aarch64", "armhf"]], // Debian 12 (Next stable) - [target: "fedora-38", image: "fedora:38", arches: ["amd64", "aarch64"]], // EOL: May 14, 2024 [target: "fedora-39", image: "fedora:39", arches: ["amd64", "aarch64"]], // EOL: November 12, 2024 [target: "fedora-40", image: "fedora:40", arches: ["amd64", "aarch64"]], // EOL: May 13, 2025 [target: "raspbian-buster", image: "balenalib/rpi-raspbian:buster", arches: ["armhf"]], // Debian/Raspbian 10 (EOL: 2024) diff --git a/rpm/Makefile b/rpm/Makefile index 2f9decfa9e..924bffdfbb 100644 --- a/rpm/Makefile +++ b/rpm/Makefile @@ -55,7 +55,7 @@ RUN?=docker run --rm \ $(RUN_FLAGS) \ rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS) -FEDORA_RELEASES ?= fedora-40 fedora-39 fedora-38 +FEDORA_RELEASES ?= fedora-40 fedora-39 CENTOS_RELEASES ?= centos-7 centos-9 ifeq ($(ARCH),s390x) RHEL_RELEASES ?= rhel-7 diff --git a/rpm/fedora-38/Dockerfile b/rpm/fedora-38/Dockerfile deleted file mode 100644 index 2729642a7b..0000000000 --- a/rpm/fedora-38/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -# syntax=docker/dockerfile:1 - -ARG GO_IMAGE -ARG DISTRO=fedora -ARG SUITE=38 -ARG BUILD_IMAGE=${DISTRO}:${SUITE} - -FROM ${GO_IMAGE} AS golang - -FROM ${BUILD_IMAGE} -ENV GOPROXY=https://proxy.golang.org|direct -ENV GO111MODULE=off -ENV GOPATH /go -ENV GOTOOLCHAIN=local -ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin -ENV AUTO_GOPATH 1 -ARG DISTRO -ARG SUITE -ENV DISTRO=${DISTRO} -ENV SUITE=${SUITE} -RUN dnf install -y rpm-build rpmlint dnf-plugins-core -COPY --link SPECS /root/rpmbuild/SPECS -RUN dnf builddep -y /root/rpmbuild/SPECS/*.spec -COPY --link --from=golang /usr/local/go /usr/local/go -WORKDIR /root/rpmbuild -ENTRYPOINT ["/bin/rpmbuild"]