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