From: Jana Babovakova <babovakova.jana@gmail.com>
Date: Wed, 16 Apr 2025 08:41:34 +0000 (+0200)
Subject: CI: enable Fedora 42: image, build, package.
X-Git-Tag: v2.17.1~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=64690b7f91f4b9cf51337aa47483d09e34f78c57;p=thirdparty%2Fbird.git

CI: enable Fedora 42: image, build, package.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65039bcb2..59afb1d97 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -158,11 +158,10 @@ docker-fedora-41-amd64:
     IMG_NAME: "fedora-41-amd64"
   <<: *docker_build
 
-#planned release 4/2025
-# docker-fedora-42-amd64:
-#   variables:
-#     IMG_NAME: "fedora-42-amd64"
-#   <<: *docker_build
+docker-fedora-42-amd64:
+  variables:
+    IMG_NAME: "fedora-42-amd64"
+  <<: *docker_build
 
 docker-opensuse-15.0-amd64:
   variables:
@@ -346,10 +345,9 @@ build-fedora-41-amd64:
   <<: *build-linux
   image: registry.nic.cz/labs/bird:fedora-41-amd64
 
-#planned release 4/2025
-# build-fedora-42-amd64:
-#   <<: *build-linux
-#   image: registry.nic.cz/labs/bird:fedora-42-amd64
+build-fedora-42-amd64:
+  <<: *build-linux
+  image: registry.nic.cz/labs/bird:fedora-42-amd64
 
 build-opensuse-15.0-amd64:
   <<: *build-linux
@@ -628,11 +626,10 @@ pkg-fedora-41-amd64:
   needs: [build-fedora-41-amd64]
   image: registry.nic.cz/labs/bird:fedora-41-amd64
 
-#planned release 4/2025
-# pkg-fedora-42-amd64:
-#   <<: *pkg-rpm
-#   needs: [build-fedora-42-amd64]
-#   image: registry.nic.cz/labs/bird:fedora-42-amd64
+pkg-fedora-42-amd64:
+  <<: *pkg-rpm
+  needs: [build-fedora-42-amd64]
+  image: registry.nic.cz/labs/bird:fedora-42-amd64
 
 pkg-opensuse-15.0-amd64:
  <<: *pkg-rpm-wa