From: Maria Matejka <mq@ucw.cz>
Date: Sat, 14 Mar 2026 21:18:10 +0000 (+0100)
Subject: CI: Always checkout master of bird-tools for netlab
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=4d2e0fa1576db7dc4282be3f914fc49f6c79eb82;p=thirdparty%2Fbird.git

CI: Always checkout master of bird-tools for netlab
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 010aa85d2..f79cbdc2e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1597,6 +1597,7 @@ build-netlab:
     - DIR=$(pwd)
     - cd $TOOLS_DIR
     - sudo git clean -fx
+    - sudo git checkout -f master
     - git pull --ff-only
     - "mv $DIR/build-netlab/* netlab/common/"
     - ln -s $STAYRTR_BINARY netlab/common/stayrtr
diff --git a/misc/gitlab/template.yml.j2 b/misc/gitlab/template.yml.j2
index 6529e8fc1..65f3d7985 100644
--- a/misc/gitlab/template.yml.j2
+++ b/misc/gitlab/template.yml.j2
@@ -413,6 +413,7 @@ build-netlab:
     - DIR=$(pwd)
     - cd $TOOLS_DIR
     - sudo git clean -fx
+    - sudo git checkout -f master
     - git pull --ff-only
     - "mv $DIR/build-netlab/* netlab/common/"
     - ln -s $STAYRTR_BINARY netlab/common/stayrtr