From: David Petera Date: Tue, 19 Aug 2025 16:05:22 +0000 (+0200) Subject: CI: Add debian trixie to pipeline X-Git-Tag: v2.17.2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9af5c30717cb2a7bf83cdd6ed9bce1b8a3648af8;p=thirdparty%2Fbird.git CI: Add debian trixie to pipeline --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ca0e6d86e..8e925202c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -275,6 +275,16 @@ docker-debian-12-i386: IMG_NAME: "debian-12-i386" <<: *docker-build +docker-debian-13-amd64: + variables: + IMG_NAME: "debian-13-amd64" + <<: *docker-build + +docker-debian-13-i386: + variables: + IMG_NAME: "debian-13-i386" + <<: *docker-build + docker-debian-testing-amd64: variables: IMG_NAME: "debian-testing-amd64" @@ -560,6 +570,20 @@ build-debian-12-i386: optional: true image: registry.nic.cz/labs/bird:debian-12-i386 +build-debian-13-amd64: + <<: *build-docker-linux-amd64 + needs: + - job: docker-debian-13-amd64 + optional: true + image: registry.nic.cz/labs/bird:debian-13-amd64 + +build-debian-13-i386: + <<: *build-docker-linux-amd64 + needs: + - job: docker-debian-13-i386 + optional: true + image: registry.nic.cz/labs/bird:debian-13-i386 + build-debian-testing-amd64: <<: *build-docker-linux-amd64 needs: @@ -919,6 +943,22 @@ pkg-debian-12-i386: - job: build-release image: registry.nic.cz/labs/bird:debian-12-i386 +pkg-debian-13-amd64: + <<: *pkg-deb + needs: + - job: build-debian-13-amd64 + artifacts: false + - job: build-release + image: registry.nic.cz/labs/bird:debian-13-amd64 + +pkg-debian-13-i386: + <<: *pkg-deb + needs: + - job: build-debian-13-i386 + artifacts: false + - job: build-release + image: registry.nic.cz/labs/bird:debian-13-i386 + pkg-debian-testing-amd64: <<: *pkg-deb needs: @@ -1169,6 +1209,18 @@ install-debian-12-i386: - job: pkg-debian-12-i386 image: registry.nic.cz/labs/bird:debian-12-i386 +install-debian-13-amd64: + <<: *install-deb + needs: + - job: pkg-debian-13-amd64 + image: registry.nic.cz/labs/bird:debian-13-amd64 + +install-debian-13-i386: + <<: *install-deb + needs: + - job: pkg-debian-13-i386 + image: registry.nic.cz/labs/bird:debian-13-i386 + install-debian-testing-amd64: <<: *install-deb needs: diff --git a/misc/docker/debian-13-amd64/Dockerfile b/misc/docker/debian-13-amd64/Dockerfile new file mode 100644 index 000000000..d90883fcb --- /dev/null +++ b/misc/docker/debian-13-amd64/Dockerfile @@ -0,0 +1,29 @@ +# bump number for image rebuild: 3 +FROM amd64/debian:trixie-slim +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get -y update +RUN apt-get -y upgrade +RUN apt-get -y --no-install-recommends install \ + build-essential \ + flex \ + bison \ + autoconf \ + ncurses-dev \ + libreadline-dev \ + libssh-dev \ + linuxdoc-tools-latex \ + texlive-latex-extra \ + opensp \ + docbook-xsl \ + xsltproc \ + adduser +RUN apt-get -y --no-install-recommends install \ + git \ + dpkg-dev \ + debhelper \ + apt-utils \ + quilt \ + python3 \ + python3-pip \ + python3-setuptools \ + python3-venv diff --git a/misc/docker/debian-13-i386/Dockerfile b/misc/docker/debian-13-i386/Dockerfile new file mode 100644 index 000000000..52ee361d4 --- /dev/null +++ b/misc/docker/debian-13-i386/Dockerfile @@ -0,0 +1,29 @@ +# bump number for image rebuild: 2 +FROM i386/debian:trixie-slim +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get -y update +RUN apt-get -y upgrade +RUN apt-get -y --no-install-recommends install \ + build-essential \ + flex \ + bison \ + autoconf \ + ncurses-dev \ + libreadline-dev \ + libssh-dev \ + linuxdoc-tools-latex \ + texlive-latex-extra \ + opensp \ + docbook-xsl \ + xsltproc \ + adduser +RUN apt-get -y --no-install-recommends install \ + git \ + dpkg-dev \ + debhelper \ + apt-utils \ + quilt \ + python3 \ + python3-pip \ + python3-setuptools \ + python3-venv diff --git a/misc/gitlab/data.yml.j2 b/misc/gitlab/data.yml.j2 index 2365bde4b..c5135c990 100644 --- a/misc/gitlab/data.yml.j2 +++ b/misc/gitlab/data.yml.j2 @@ -40,7 +40,7 @@ distros: type: pkg-deb-legacy # Debian regular builds - {% for num in (10, 11, 12, 'testing') -%} + {% for num in (10, 11, 12, 13, 'testing') -%} {% for arch in ('amd64', 'i386') -%} - name: debian-{{num}}-{{arch}} type: pkg-deb