From: Maria Matejka <mq@ucw.cz>
Date: Mon, 13 Jan 2025 20:54:32 +0000 (+0100)
Subject: Merge branch 'mq-build-update' into 132-compat-cli
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d5b30baa8079ee259237247a7eb997db70a846d;p=thirdparty%2Fbird.git

Merge branch 'mq-build-update' into 132-compat-cli
---

6d5b30baa8079ee259237247a7eb997db70a846d
diff --cc .gitlab-ci.yml
index 1b84ce8fc,1e84f670f..c574e332e
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -256,6 -427,48 +427,41 @@@ pkg-fedora-34-amd64
    needs: [build-fedora-34-amd64]
    image: registry.nic.cz/labs/bird:fedora-34-amd64
  
+ pkg-fedora-35-amd64:
+   <<: *pkg-rpm
+   needs: [build-fedora-35-amd64]
+   image: registry.nic.cz/labs/bird:fedora-35-amd64
+ 
+ pkg-fedora-36-amd64:
+   <<: *pkg-rpm
+   needs: [build-fedora-36-amd64]
+   image: registry.nic.cz/labs/bird:fedora-36-amd64
+ 
+ pkg-fedora-37-amd64:
+   <<: *pkg-rpm
+   needs: [build-fedora-37-amd64]
+   image: registry.nic.cz/labs/bird:fedora-37-amd64
+ 
+ pkg-fedora-38-amd64:
+   <<: *pkg-rpm
+   needs: [build-fedora-38-amd64]
+   image: registry.nic.cz/labs/bird:fedora-38-amd64
+ 
+ pkg-fedora-39-amd64:
+   <<: *pkg-rpm
+   needs: [build-fedora-39-amd64]
+   image: registry.nic.cz/labs/bird:fedora-39-amd64
+ 
+ pkg-fedora-40-amd64:
+   <<: *pkg-rpm
+   needs: [build-fedora-40-amd64]
+   image: registry.nic.cz/labs/bird:fedora-40-amd64
+ 
+ pkg-fedora-41-amd64:
+   <<: *pkg-rpm
+   needs: [build-fedora-41-amd64]
+   image: registry.nic.cz/labs/bird:fedora-41-amd64
+ 
 -#pkg-centos-7-amd64:
 -#  <<: *pkg-rpm-wa
 -#  variables:
 -#    LC_ALL: en_US.UTF-8
 -#  needs: [build-centos-7-amd64]
 -#  image: registry.nic.cz/labs/bird:centos-7-amd64
 -
  pkg-centos-8-amd64:
    <<: *pkg-rpm-wa
    needs: [build-centos-8-amd64]
diff --cc misc/docker/debian-11-i386/Dockerfile
index 5b5ad5a36,abe70f507..d4a14c780
--- a/misc/docker/debian-11-i386/Dockerfile
+++ b/misc/docker/debian-11-i386/Dockerfile
@@@ -1,3 -1,4 +1,4 @@@
 -# bump number for image rebuild: 1
++# bump number for image rebuild: 2
  FROM i386/debian:bullseye-slim
  ENV DEBIAN_FRONTEND=noninteractive
  RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list