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>
This commit is contained in:
Tim Hadwen
2026-02-15 17:38:52 +10:00
parent f54fb00f57
commit a9b5e1fa07
2 changed files with 18 additions and 11 deletions

View File

@@ -64,8 +64,8 @@ outputs:
type: bom type: bom
dir: /tmp dir: /tmp
options: options:
columns: columns:
- field: Value - field: Value
name: value name: value
- field: Quantity Per PCB - field: Quantity Per PCB
name: qty name: qty
@@ -79,17 +79,18 @@ outputs:
- conn_manf - conn_manf
- conn_mpn - conn_mpn
- field: References - field: References
name: refs name: refs
group_fields: ['Value', 'Footprint', 'mpn']
exclude_filter: "" exclude_filter: ""
output: "%f_%r%v_%i.%x" output: "%f_%r%v_%i.%x"
expand_text_vars: true expand_text_vars: true
- name: 'bom_csv' - name: 'bom_csv'
type: bom type: bom
dir: . dir: .
options: options:
columns: columns:
- field: Value - field: Value
name: value name: value
- field: Quantity Per PCB - field: Quantity Per PCB
name: qty name: qty
@@ -103,7 +104,8 @@ outputs:
- conn_manf - conn_manf
- conn_mpn - conn_mpn
- field: References - field: References
name: refs name: refs
group_fields: ['Value', 'Footprint', 'mpn']
exclude_filter: "" exclude_filter: ""
output: "%f_%r%v_%i.%x" output: "%f_%r%v_%i.%x"
expand_text_vars: true expand_text_vars: true
@@ -113,12 +115,12 @@ outputs:
hide_stats_info: true hide_stats_info: true
format: "CSV" format: "CSV"
- name: 'bom_xlsx' - name: 'bom_xlsx'
type: bom type: bom
dir: . dir: .
options: options:
columns: columns:
- field: Value - field: Value
name: value name: value
- field: Quantity Per PCB - field: Quantity Per PCB
name: qty name: qty
@@ -132,7 +134,8 @@ outputs:
- conn_manf - conn_manf
- conn_mpn - conn_mpn
- field: References - field: References
name: refs name: refs
group_fields: ['Value', 'Footprint', 'mpn']
exclude_filter: "" exclude_filter: ""
output: "%f_%r%v_%i.%x" output: "%f_%r%v_%i.%x"
expand_text_vars: true expand_text_vars: true

View File

@@ -388,6 +388,10 @@ inventree_main:
# Generate Samsung P&P files only on actual release # Generate Samsung P&P files only on actual release
echo "Generating Samsung pick-and-place files..." echo "Generating Samsung pick-and-place files..."
python main.py samsung $CI_PROJECT_DIR/Fabrication 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 fi
cd $CI_PROJECT_DIR cd $CI_PROJECT_DIR