public/kicad-ci
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix InvenTree uploads to use dev revision for MRs

Browse Source 
- Dev branch commits: upload to "dev" revision (was dry-run)
- MRs targeting main: upload to "dev" revision (was actual version)
- Actual main commits: upload to versioned revision

This allows pre-ordering parts during development while preventing
accidental version uploads until code is actually merged.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Tim Hadwen
2026-02-01 22:30:23 +10:00
parent 78fa1c0652
commit 5ac89f2df3
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
kibot-ci.yml
View File

@@ -326,9 +326,9 @@ inventree_dev:
artifacts: true artifacts: true
script: script:
- | - |
echo "Running InvenTree upload in dry-run mode for dev branch" echo "Running InvenTree upload for dev branch (revision: dev)"
cd hfsntree cd hfsntree
python main.py batch $CI_PROJECT_DIR/Fabrication --dry-run -y python main.py batch $CI_PROJECT_DIR/Fabrication --version-override dev -y
inventree_main: inventree_main:
extends: .inventree_base extends: .inventree_base
@@ -357,13 +357,21 @@ inventree_main:
expire_in: 1 week expire_in: 1 week
script: script:
- | - |
echo "Running InvenTree upload for main branch"
cd hfsntree cd hfsntree
python main.py batch $CI_PROJECT_DIR/Fabrication -y
# Generate Samsung P&P files (requires parts to exist in InvenTree) # MRs targeting main upload to "dev" revision for pre-ordering parts
echo "Generating Samsung pick-and-place files..." # Actual commits to main upload to the versioned revision
python main.py samsung $CI_PROJECT_DIR/Fabrication if [[ "$CI_PIPELINE_SOURCE" == "merge_request_event" ]]; then
echo "Running InvenTree upload for MR (revision: dev)"
python main.py batch $CI_PROJECT_DIR/Fabrication --version-override dev -y
else
echo "Running InvenTree upload for main branch (revision: $VERSION)"
python main.py batch $CI_PROJECT_DIR/Fabrication -y
# Generate Samsung P&P files only on actual release
echo "Generating Samsung pick-and-place files..."
python main.py samsung $CI_PROJECT_DIR/Fabrication
fi
cd $CI_PROJECT_DIR cd $CI_PROJECT_DIR
# ============================================================================= # =============================================================================