Skip to content

Commit 9922aa4

Browse files
authored
Merge pull request #1005 from thaJeztah/carry_992_enable_fedora_40_builds
[master] Enable Fedora 40 builds (carry 992)
2 parents 5fb0be0 + b0abfdc commit 9922aa4

File tree

3 files changed

+28
-1
lines changed

3 files changed

+28
-1
lines changed

Jenkinsfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ def pkgs = [
1111
[target: "debian-bookworm", image: "debian:bookworm", arches: ["amd64", "aarch64", "armhf"]], // Debian 12 (Next stable)
1212
[target: "fedora-38", image: "fedora:38", arches: ["amd64", "aarch64"]], // EOL: May 14, 2024
1313
[target: "fedora-39", image: "fedora:39", arches: ["amd64", "aarch64"]], // EOL: November 12, 2024
14+
[target: "fedora-40", image: "fedora:40", arches: ["amd64", "aarch64"]], // EOL: May 13, 2025
1415
[target: "raspbian-buster", image: "balenalib/rpi-raspbian:buster", arches: ["armhf"]], // Debian/Raspbian 10 (EOL: 2024)
1516
[target: "raspbian-bullseye", image: "balenalib/rpi-raspbian:bullseye", arches: ["armhf"]], // Debian/Raspbian 11 (stable)
1617
[target: "raspbian-bookworm", image: "balenalib/rpi-raspbian:bookworm", arches: ["armhf"]], // Debian/Raspbian 12 (next stable)

rpm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ RUN?=docker run --rm \
4949
$(RUN_FLAGS) \
5050
rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS)
5151

52-
FEDORA_RELEASES ?= fedora-39 fedora-38
52+
FEDORA_RELEASES ?= fedora-40 fedora-39 fedora-38
5353
CENTOS_RELEASES ?= centos-7 centos-8 centos-9
5454
ifeq ($(ARCH),s390x)
5555
RHEL_RELEASES ?= rhel-7

rpm/fedora-40/Dockerfile

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# syntax=docker/dockerfile:1
2+
3+
ARG GO_IMAGE
4+
ARG DISTRO=fedora
5+
ARG SUITE=40
6+
ARG BUILD_IMAGE=${DISTRO}:${SUITE}
7+
8+
FROM ${GO_IMAGE} AS golang
9+
10+
FROM ${BUILD_IMAGE}
11+
ENV GOPROXY=https://proxy.golang.org|direct
12+
ENV GO111MODULE=off
13+
ENV GOPATH /go
14+
ENV GOTOOLCHAIN=local
15+
ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
16+
ENV AUTO_GOPATH 1
17+
ARG DISTRO
18+
ARG SUITE
19+
ENV DISTRO=${DISTRO}
20+
ENV SUITE=${SUITE}
21+
RUN dnf install -y rpm-build rpmlint dnf-plugins-core
22+
COPY --link SPECS /root/rpmbuild/SPECS
23+
RUN dnf builddep -y /root/rpmbuild/SPECS/*.spec
24+
COPY --link --from=golang /usr/local/go /usr/local/go
25+
WORKDIR /root/rpmbuild
26+
ENTRYPOINT ["/bin/rpmbuild"]

0 commit comments

Comments
 (0)