From a9b5e1fa072317db7464bafbea6eee5be9c182c6 Mon Sep 17 00:00:00 2001
From: Tim Hadwen <tim@micromelon.com.au>
Date: Sun, 15 Feb 2026 17:38:52 +1000
Subject: [PATCH] Add BOM group_fields for MPN and deactivate-old CI step

- Add group_fields: [Value, Footprint, mpn] to all BOM outputs to prevent
  components with different MPNs from being merged into one row
- Add deactivate-old step to inventree_main release pipeline

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 configs/default.kibot.yaml | 25 ++++++++++++++-----------
 kibot-ci.yml               |  4 ++++
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/configs/default.kibot.yaml b/configs/default.kibot.yaml
index ec7d15c..251eeee 100644
--- a/configs/default.kibot.yaml
+++ b/configs/default.kibot.yaml
@@ -64,8 +64,8 @@ outputs:
     type: bom
     dir: /tmp
     options:
-      columns: 
-        - field: Value 
+      columns:
+        - field: Value
           name: value
         - field: Quantity Per PCB
           name: qty
@@ -79,17 +79,18 @@ outputs:
         - conn_manf
         - conn_mpn
         - field: References
-          name: refs 
+          name: refs
+      group_fields: ['Value', 'Footprint', 'mpn']
       exclude_filter: ""
       output: "%f_%r%v_%i.%x"
       expand_text_vars: true
 
-  - name: 'bom_csv'  
+  - name: 'bom_csv'
     type: bom
     dir: .
     options:
-      columns: 
-        - field: Value 
+      columns:
+        - field: Value
           name: value
         - field: Quantity Per PCB
           name: qty
@@ -103,7 +104,8 @@ outputs:
         - conn_manf
         - conn_mpn
         - field: References
-          name: refs 
+          name: refs
+      group_fields: ['Value', 'Footprint', 'mpn']
       exclude_filter: ""
       output: "%f_%r%v_%i.%x"
       expand_text_vars: true
@@ -113,12 +115,12 @@ outputs:
         hide_stats_info: true
       format: "CSV"
 
-  - name: 'bom_xlsx'  
+  - name: 'bom_xlsx'
     type: bom
     dir: .
     options:
-      columns: 
-        - field: Value 
+      columns:
+        - field: Value
           name: value
         - field: Quantity Per PCB
           name: qty
@@ -132,7 +134,8 @@ outputs:
         - conn_manf
         - conn_mpn
         - field: References
-          name: refs 
+          name: refs
+      group_fields: ['Value', 'Footprint', 'mpn']
       exclude_filter: ""
       output: "%f_%r%v_%i.%x"
       expand_text_vars: true
diff --git a/kibot-ci.yml b/kibot-ci.yml
index 40234dd..894f869 100644
--- a/kibot-ci.yml
+++ b/kibot-ci.yml
@@ -388,6 +388,10 @@ inventree_main:
         # Generate Samsung P&P files only on actual release
         echo "Generating Samsung pick-and-place files..."
         python main.py samsung $CI_PROJECT_DIR/Fabrication
+
+        # Deactivate old revisions (keep only current release + dev)
+        echo "Deactivating old InvenTree revisions..."
+        python main.py deactivate-old $CI_PROJECT_DIR/Fabrication
       fi
       cd $CI_PROJECT_DIR