Add name text variable and enable panel jobs on dev
- Added 'name' text variable to pcb_main, sch, mech, pos kibot configs - Removed main_rules restriction from generate_gerbers, generate_position, generate_panel - Updated inventree_dev to depend on gerbers, position, panel jobs Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -15,3 +15,5 @@ preflight:
|
|||||||
command: 'if [ -n "$KIBOT_VAR_rev" ]; then echo $KIBOT_VAR_rev; else git describe --tags 2>/dev/null || echo $CI_COMMIT_SHORT_SHA; fi'
|
command: 'if [ -n "$KIBOT_VAR_rev" ]; then echo $KIBOT_VAR_rev; else git describe --tags 2>/dev/null || echo $CI_COMMIT_SHORT_SHA; fi'
|
||||||
- name: 'rev_pcb'
|
- name: 'rev_pcb'
|
||||||
command: 'if [ -n "$KIBOT_VAR_rev_pcb" ]; then echo $KIBOT_VAR_rev_pcb; else git describe --tags 2>/dev/null || echo $CI_COMMIT_SHORT_SHA; fi'
|
command: 'if [ -n "$KIBOT_VAR_rev_pcb" ]; then echo $KIBOT_VAR_rev_pcb; else git describe --tags 2>/dev/null || echo $CI_COMMIT_SHORT_SHA; fi'
|
||||||
|
- name: 'name'
|
||||||
|
command: 'if [ -n "$KIBOT_VAR_name" ]; then echo $KIBOT_VAR_name; else echo $KIBOT_PCB_NAME | rev | cut -d"/" -f1 | rev | cut -d"-" -f1; fi'
|
||||||
|
|||||||
@@ -15,3 +15,5 @@ preflight:
|
|||||||
command: 'if [ -n "$KIBOT_VAR_rev" ]; then echo $KIBOT_VAR_rev; else git describe --tags 2>/dev/null || echo $CI_COMMIT_SHORT_SHA; fi'
|
command: 'if [ -n "$KIBOT_VAR_rev" ]; then echo $KIBOT_VAR_rev; else git describe --tags 2>/dev/null || echo $CI_COMMIT_SHORT_SHA; fi'
|
||||||
- name: 'rev_pcb'
|
- name: 'rev_pcb'
|
||||||
command: 'if [ -n "$KIBOT_VAR_rev_pcb" ]; then echo $KIBOT_VAR_rev_pcb; else git describe --tags 2>/dev/null || echo $CI_COMMIT_SHORT_SHA; fi'
|
command: 'if [ -n "$KIBOT_VAR_rev_pcb" ]; then echo $KIBOT_VAR_rev_pcb; else git describe --tags 2>/dev/null || echo $CI_COMMIT_SHORT_SHA; fi'
|
||||||
|
- name: 'name'
|
||||||
|
command: 'if [ -n "$KIBOT_VAR_name" ]; then echo $KIBOT_VAR_name; else echo $KIBOT_PCB_NAME | rev | cut -d"/" -f1 | rev | cut -d"-" -f1; fi'
|
||||||
|
|||||||
@@ -15,3 +15,5 @@ preflight:
|
|||||||
command: 'if [ -n "$KIBOT_VAR_rev" ]; then echo $KIBOT_VAR_rev; else git describe --tags 2>/dev/null || echo $CI_COMMIT_SHORT_SHA; fi'
|
command: 'if [ -n "$KIBOT_VAR_rev" ]; then echo $KIBOT_VAR_rev; else git describe --tags 2>/dev/null || echo $CI_COMMIT_SHORT_SHA; fi'
|
||||||
- name: 'rev_pcb'
|
- name: 'rev_pcb'
|
||||||
command: 'if [ -n "$KIBOT_VAR_rev_pcb" ]; then echo $KIBOT_VAR_rev_pcb; else git describe --tags 2>/dev/null || echo $CI_COMMIT_SHORT_SHA; fi'
|
command: 'if [ -n "$KIBOT_VAR_rev_pcb" ]; then echo $KIBOT_VAR_rev_pcb; else git describe --tags 2>/dev/null || echo $CI_COMMIT_SHORT_SHA; fi'
|
||||||
|
- name: 'name'
|
||||||
|
command: 'if [ -n "$KIBOT_VAR_name" ]; then echo $KIBOT_VAR_name; else echo $KIBOT_PCB_NAME | rev | cut -d"/" -f1 | rev | cut -d"-" -f1; fi'
|
||||||
|
|||||||
@@ -14,3 +14,5 @@ preflight:
|
|||||||
command: 'if [ -n "$KIBOT_VAR_rev" ]; then echo $KIBOT_VAR_rev; else git describe --tags 2>/dev/null || echo $CI_COMMIT_SHORT_SHA; fi'
|
command: 'if [ -n "$KIBOT_VAR_rev" ]; then echo $KIBOT_VAR_rev; else git describe --tags 2>/dev/null || echo $CI_COMMIT_SHORT_SHA; fi'
|
||||||
- name: 'rev_pcb'
|
- name: 'rev_pcb'
|
||||||
command: 'if [ -n "$KIBOT_VAR_rev_pcb" ]; then echo $KIBOT_VAR_rev_pcb; else git describe --tags 2>/dev/null || echo $CI_COMMIT_SHORT_SHA; fi'
|
command: 'if [ -n "$KIBOT_VAR_rev_pcb" ]; then echo $KIBOT_VAR_rev_pcb; else git describe --tags 2>/dev/null || echo $CI_COMMIT_SHORT_SHA; fi'
|
||||||
|
- name: 'name'
|
||||||
|
command: 'if [ -n "$KIBOT_VAR_name" ]; then echo $KIBOT_VAR_name; else echo $KIBOT_PCB_NAME | rev | cut -d"/" -f1 | rev | cut -d"-" -f1; fi'
|
||||||
|
|||||||
13
kibot-ci.yml
13
kibot-ci.yml
@@ -226,8 +226,6 @@ generate_3d:
|
|||||||
|
|
||||||
generate_gerbers:
|
generate_gerbers:
|
||||||
extends: .fabrication_base
|
extends: .fabrication_base
|
||||||
rules:
|
|
||||||
- !reference [.main_rules, rules]
|
|
||||||
script:
|
script:
|
||||||
- |
|
- |
|
||||||
export KIBOT_VAR_rev="${VERSION}"
|
export KIBOT_VAR_rev="${VERSION}"
|
||||||
@@ -244,8 +242,6 @@ generate_gerbers:
|
|||||||
|
|
||||||
generate_position:
|
generate_position:
|
||||||
extends: .fabrication_base
|
extends: .fabrication_base
|
||||||
rules:
|
|
||||||
- !reference [.main_rules, rules]
|
|
||||||
script:
|
script:
|
||||||
- |
|
- |
|
||||||
export KIBOT_VAR_rev="${VERSION}"
|
export KIBOT_VAR_rev="${VERSION}"
|
||||||
@@ -262,8 +258,6 @@ generate_position:
|
|||||||
|
|
||||||
generate_panel:
|
generate_panel:
|
||||||
extends: .fabrication_base
|
extends: .fabrication_base
|
||||||
rules:
|
|
||||||
- !reference [.main_rules, rules]
|
|
||||||
script:
|
script:
|
||||||
- |
|
- |
|
||||||
export KIBOT_VAR_rev="${VERSION}"
|
export KIBOT_VAR_rev="${VERSION}"
|
||||||
@@ -340,6 +334,13 @@ inventree_dev:
|
|||||||
artifacts: true
|
artifacts: true
|
||||||
- job: generate_3d
|
- job: generate_3d
|
||||||
artifacts: true
|
artifacts: true
|
||||||
|
- job: generate_gerbers
|
||||||
|
artifacts: true
|
||||||
|
- job: generate_position
|
||||||
|
artifacts: true
|
||||||
|
- job: generate_panel
|
||||||
|
artifacts: true
|
||||||
|
optional: true
|
||||||
script:
|
script:
|
||||||
- |
|
- |
|
||||||
echo "Running InvenTree upload for dev branch (revision: dev)"
|
echo "Running InvenTree upload for dev branch (revision: dev)"
|
||||||
|
|||||||
Reference in New Issue
Block a user