From 0794509a6b3d8f163641af70108ba35be7a7703a Mon Sep 17 00:00:00 2001
From: andrewc <andrew@micromelon.com.au>
Date: Wed, 23 Oct 2024 11:20:19 +1000
Subject: [PATCH] Fixed up inventree_job rules and updated to latest version of
 ki-ntree cli

---
 .scripts/ki-ntree | 2 +-
 kibot-ci.yml      | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.scripts/ki-ntree b/.scripts/ki-ntree
index bebdba0..a8ece2c 160000
--- a/.scripts/ki-ntree
+++ b/.scripts/ki-ntree
@@ -1 +1 @@
-Subproject commit bebdba04aa8ef1d4567739fa2383135385d26b9b
+Subproject commit a8ece2c014db17b01c51a5865bb3742cdae64216
diff --git a/kibot-ci.yml b/kibot-ci.yml
index 72376bf..c06cb4e 100644
--- a/kibot-ci.yml
+++ b/kibot-ci.yml
@@ -265,7 +265,9 @@ inventree_job:
     - job: outputs_all
       artifacts: true
   rules:
-    - !reference [.main_rules, rules]
+    - if: $CI_COMMIT_TAG
+      when: never                                  # Do not run this job when a tag is created manually
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH  # Run this job when commits are pushed or merged to the default branch
   script:
     - !reference [.commands, boms]