From: Maria Matejka <mq@ucw.cz>
Date: Mon, 31 Mar 2025 11:59:53 +0000 (+0200)
Subject: Merge commit '1e5a7113b' into thread-next
X-Git-Tag: v3.1.0~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93847bf2296d9b00f281e5b4202f28546621271b;p=thirdparty%2Fbird.git

Merge commit '1e5a7113b' into thread-next
---

93847bf2296d9b00f281e5b4202f28546621271b
diff --cc .gitlab-ci.yml
index e684e095b,fd7582770..323021799
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -337,15 -330,24 +337,17 @@@ pkg-fedora-34-amd64
    needs: [build-fedora-34-amd64]
    image: registry.nic.cz/labs/bird:fedora-34-amd64
  
- pkg-centos-8-amd64:
-   <<: *pkg-rpm-wa
-   needs: [build-centos-8-amd64]
-   image: registry.nic.cz/labs/bird:centos-8-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-ubuntu-18.04-amd64:
-   <<: *pkg-deb
-   needs: [build-ubuntu-18_04-amd64]
-   image: registry.nic.cz/labs/bird:ubuntu-18.04-amd64
+ # Removed due to apkg breakage
+ #pkg-centos-8-amd64:
+ #  <<: *pkg-rpm-wa
+ #  needs: [build-centos-8-amd64]
+ #  image: registry.nic.cz/labs/bird:centos-8-amd64
+ 
+ # Removed due to apkg breakage
+ #pkg-ubuntu-18.04-amd64:
+ #  <<: *pkg-deb
+ #  needs: [build-ubuntu-18_04-amd64]
+ #  image: registry.nic.cz/labs/bird:ubuntu-18.04-amd64
  
  pkg-ubuntu-20.04-amd64:
    <<: *pkg-deb