From: Maria Matejka <mq@ucw.cz>
Date: Thu, 19 Jun 2025 19:03:27 +0000 (+0200)
Subject: CI: Pinned apkg version to 0.5.1 until 0.6.0 is fixed
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5071c1fe9f41a94e72c1546acf23386f2b223362;p=thirdparty%2Fbird.git

CI: Pinned apkg version to 0.5.1 until 0.6.0 is fixed

This workarounds packaging/apkg#114.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 167a312cf..a7ea52686 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,6 +17,7 @@ variables:
   IMG_BASE: registry.nic.cz/labs/bird
   TOOLS_DIR: /home/gitlab-runner/bird-tools
   STAYRTR_BINARY: /usr/local/bin/stayrtr
+  APKG_VERSION: 0.5.1
 
 stages:
   - consistency
@@ -641,7 +642,7 @@ build-release:
   script:
     # create venv only if it's installed
     - if python3 -m venv venv; then . venv/bin/activate; fi
-    - pip3 install apkg
+    - pip3 install apkg==$APKG_VERSION
     - apkg build -a bird-$(cat VERSION)*.tar.gz
   artifacts:
     paths:
@@ -658,7 +659,7 @@ build-release:
     # apkg depends on bs4, and unless we want to backport python 3.6
     # to ancient distros, we need to do this workaround
     - pip3 install beautifulsoup4==4.11.2
-    - pip3 install apkg
+    - pip3 install apkg==$APKG_VERSION
     - apkg build -a bird-$(cat VERSION)*.tar.gz
   artifacts:
     paths:
@@ -669,7 +670,7 @@ build-release:
   <<: *test-job
   stage: pkg
   script:
-    - pip3 install apkg
+    - pip3 install apkg==$APKG_VERSION
     - apkg build -a bird-$(cat VERSION)*.tar.gz
   artifacts:
     paths:
@@ -683,7 +684,7 @@ build-release:
     - sed -i "s/runstatedir/with-runtimedir/" distro/pkg/rpm/bird.spec
     # install older version of bs4 that does not use python version >= 3.6
     - pip3 install beautifulsoup4==4.11.2
-    - pip3 install apkg
+    - pip3 install apkg==$APKG_VERSION
     - apkg build -a bird-$(cat VERSION)*.tar.gz
   artifacts:
     paths:
diff --git a/misc/gitlab/template.yml.j2 b/misc/gitlab/template.yml.j2
index 743c442d1..b4abc4aec 100644
--- a/misc/gitlab/template.yml.j2
+++ b/misc/gitlab/template.yml.j2
@@ -17,6 +17,7 @@ variables:
   IMG_BASE: registry.nic.cz/labs/bird
   TOOLS_DIR: /home/gitlab-runner/bird-tools
   STAYRTR_BINARY: /usr/local/bin/stayrtr
+  APKG_VERSION: 0.5.1
 
 stages:
   - consistency
@@ -241,7 +242,7 @@ build-release:
   script:
     # create venv only if it's installed
     - if python3 -m venv venv; then . venv/bin/activate; fi
-    - pip3 install apkg
+    - pip3 install apkg==$APKG_VERSION
     - apkg build -a bird-$(cat VERSION)*.tar.gz
   artifacts:
     paths:
@@ -258,7 +259,7 @@ build-release:
     # apkg depends on bs4, and unless we want to backport python 3.6
     # to ancient distros, we need to do this workaround
     - pip3 install beautifulsoup4==4.11.2
-    - pip3 install apkg
+    - pip3 install apkg==$APKG_VERSION
     - apkg build -a bird-$(cat VERSION)*.tar.gz
   artifacts:
     paths:
@@ -269,7 +270,7 @@ build-release:
   <<: *test-job
   stage: pkg
   script:
-    - pip3 install apkg
+    - pip3 install apkg==$APKG_VERSION
     - apkg build -a bird-$(cat VERSION)*.tar.gz
   artifacts:
     paths:
@@ -283,7 +284,7 @@ build-release:
     - sed -i "s/runstatedir/with-runtimedir/" distro/pkg/rpm/bird.spec
     # install older version of bs4 that does not use python version >= 3.6
     - pip3 install beautifulsoup4==4.11.2
-    - pip3 install apkg
+    - pip3 install apkg==$APKG_VERSION
     - apkg build -a bird-$(cat VERSION)*.tar.gz
   artifacts:
     paths: