CI: Force v2.18 package rebuild

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 010aa85d2a5ffc16c4d303f8d077a15e814dc40f..1faca7bf03a1da775c383a273e6384897e2fc2c7 100644 (file)
--- 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
+  FORCE_VERSION: "2.18"
 
 stages:
   - consistency
@@ -353,7 +354,9 @@ docker-ubuntu-25.10-amd64:
     - tools/version && ( echo -n "BIRD version "; tools/version ) > version-expected
     - |
       STABLE_VERSION="`cat VERSION`"
-      if [ "$CI_COMMIT_MESSAGE" == "NEWS and version update
+      if [ -n "$FORCE_VERSION" ]; then
+        echo "Forcing version $FORCE_VERSION"
+      elif [ "$CI_COMMIT_MESSAGE" == "NEWS and version update
       " ]; then
         if [ "${STABLE_VERSION}" == "`tools/version`" ]; then
           echo "Stable version precheck OK"

diff --git a/tools/test-install b/tools/test-install
index 4711783afabc4af72f6297bd0f7a7e4d35d6c4a8..2283335497a3c3af1d7224dfa6b6a8bb0c07f098 100755 (executable)
--- a/tools/test-install
+++ b/tools/test-install
@@ -18,7 +18,7 @@ bird --version 2>&1 | grep -F "$STABLE_VERSION"
 bird --version 2>version-reported
 
 
-if [ "$CI_COMMIT_MESSAGE" = "NEWS and version update" ]; then
+if [ "$CI_COMMIT_MESSAGE" = "NEWS and version update" ] || [ -n "$FORCE_VERSION" ]; then
   echo "Processing a release commit..."
   echo "BIRD version ${STABLE_VERSION}" > version-expected
   diff version-reported version-expected

diff --git a/tools/version b/tools/version
index 0ef4f13ec206b2a79ac9535b4b8368843a65fe54..6b4a11ba50319a8eaf63997cb9ee5543061dd5bf 100755 (executable)
--- a/tools/version
+++ b/tools/version
@@ -6,6 +6,11 @@ set -e
 toplevel="$(readlink -f $(dirname $0)/../)"
 RELEASE_VERSION=$(cat "$toplevel/VERSION")
 
+if [ -n "$FORCE_VERSION" ]; then
+  echo $FORCE_VERSION
+  exit 0
+fi
+
 # Not in a git repo, or no git installed.
 if ! git status --porcelain > /dev/null; then
   echo $RELEASE_VERSION