diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 417faf2b0c..2f9629d2e0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,6 +19,7 @@ jobs: target: - debian-bullseye - debian-bookworm + - debian-trixie - ubuntu-focal - ubuntu-jammy - ubuntu-noble diff --git a/Jenkinsfile b/Jenkinsfile index e3f8736056..ffad6bbc4b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,6 +7,7 @@ def pkgs = [ [target: "centos-10", image: "quay.io/centos/centos:stream10", arches: ["amd64", "aarch64"]], // CentOS Stream 10 (EOL: 2030) [target: "debian-bullseye", image: "debian:bullseye", arches: ["amd64", "aarch64", "armhf"]], // Debian 11 (oldstable, EOL: 2024-08-14, EOL (LTS): 2026-08-31) [target: "debian-bookworm", image: "debian:bookworm", arches: ["amd64", "aarch64", "armhf"]], // Debian 12 (stable, EOL: 2026-06-10, EOL (LTS): 2028-06-30) + [target: "debian-trixie", image: "debian:trixie", arches: ["amd64", "aarch64", "armhf"]], // Debian 13 (testing) [target: "fedora-40", image: "fedora:40", arches: ["amd64", "aarch64"]], // EOL: May 13, 2025 [target: "fedora-41", image: "fedora:41", arches: ["amd64", "aarch64"]], // EOL: November 19, 2025 [target: "fedora-42", image: "fedora:42", arches: ["amd64", "aarch64"]], // EOL: May 13, 2026 diff --git a/deb/Makefile b/deb/Makefile index 7f8a00644d..d00180a173 100644 --- a/deb/Makefile +++ b/deb/Makefile @@ -50,7 +50,7 @@ RUN?=docker run --rm \ $(RUN_FLAGS) \ debbuild-$@/$(ARCH) -DEBIAN_VERSIONS ?= debian-bullseye debian-bookworm +DEBIAN_VERSIONS ?= debian-bullseye debian-bookworm debian-trixie UBUNTU_VERSIONS ?= ubuntu-focal ubuntu-jammy ubuntu-noble ubuntu-oracular ubuntu-plucky RASPBIAN_VERSIONS ?= raspbian-bullseye raspbian-bookworm DISTROS := $(DEBIAN_VERSIONS) $(UBUNTU_VERSIONS) $(RASPBIAN_VERSIONS) diff --git a/deb/debian-trixie/Dockerfile b/deb/debian-trixie/Dockerfile new file mode 100644 index 0000000000..174bcb40b3 --- /dev/null +++ b/deb/debian-trixie/Dockerfile @@ -0,0 +1,40 @@ +# syntax=docker/dockerfile:1 + +ARG GO_IMAGE=golang:latest +ARG DISTRO=debian +ARG SUITE=trixie +ARG VERSION_ID=13 +ARG BUILD_IMAGE=${DISTRO}:${SUITE} + +FROM ${GO_IMAGE} AS golang + +FROM ${BUILD_IMAGE} + +ARG DEBIAN_FRONTEND=noninteractive +RUN apt-get update && apt-get install -y curl devscripts equivs git + +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 + +ARG COMMON_FILES +COPY --link ${COMMON_FILES} /root/build-deb/debian +RUN apt-get update \ + && mk-build-deps -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y" -i /root/build-deb/debian/control + +COPY --link sources/ /sources +ARG DISTRO +ARG SUITE +ARG VERSION_ID +ENV DISTRO=${DISTRO} +ENV SUITE=${SUITE} +ENV VERSION_ID=${VERSION_ID} + +COPY --link --from=golang /usr/local/go /usr/local/go + +WORKDIR /root/build-deb +COPY build-deb /root/build-deb/build-deb + +ENTRYPOINT ["/root/build-deb/build-deb"]