diff --git a/Dockerfile b/Dockerfile index ea323fd6..22e34ed7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM setsoft/kicad_auto:dev +FROM setsoft/kicad_auto:dev_k6 LABEL AUTHOR Salvador E. Tropea -LABEL Description="Export various files from KiCad projects (KiCad 5 + development)" +LABEL Description="Export various files from KiCad projects (KiCad 6 + development)" COPY entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh diff --git a/action.yml b/action.yml index 49e18a48..e1e098b4 100644 --- a/action.yml +++ b/action.yml @@ -39,6 +39,10 @@ inputs: description: 'Global variant to use [default: no variants]' required: false default: '__NONE__' + install3D: + description: 'Install the 3D models, use YES [default: NO]' + required: false + default: 'NO' verbose: description: 'Verbosity level [default: 0]' required: false @@ -56,6 +60,7 @@ runs: - -t ${{ inputs.targets }} - -v ${{ inputs.verbose }} - -V ${{ inputs.variant }} + - -i ${{ inputs.install3D }} branding: icon: 'cpu' color: 'green' diff --git a/entrypoint.sh b/entrypoint.sh index 30fb208f..84348da8 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -12,6 +12,7 @@ DIR="" VARIANT="" TARGETS="" QUICKSTART="NO" +INSTALL3D="NO" # Exit error code EXIT_ERROR=1 @@ -44,6 +45,7 @@ function msg_help { echo -e " '-s PRES' skip preflights, comma separated or 'all'" echo -e " '-t TARGETS' list of targets to generate separated by spaces. To only run preflights use __NONE__." echo -e " '-V VARIANT' global variant" + echo -e " '-i YES' install the 3D models." echo -e "\nMiscellaneous:" echo -e " '-v LEVEL' annotate program execution" @@ -123,6 +125,8 @@ function args_process { ;; -q) QUICKSTART="$VAL" ;; + -i) INSTALL3D="$VAL" + ;; -s) if [ "$VAL" == "__NONE__" ]; then SKIP="" else @@ -157,6 +161,10 @@ function run { /usr/bin/kicad-git-filters.py fi + if [ $INSTALL3D == "YES" ]; then + /usr/bin/kicad_3d_install.sh + fi + if [ $QUICKSTART == "YES" ]; then echo Quick-start options: $VERBOSE --quick-start /bin/bash -c "kibot $VERBOSE --quick-start"