From 030d8f23679ef96329f9c381e97ac9e6841d6ecf Mon Sep 17 00:00:00 2001 From: kaklik Date: Fri, 22 Sep 2023 22:56:58 +0000 Subject: [PATCH] Update workflow files --- .github/workflows/kicad_outputs.yml | 52 ++++++++++++++++------------- doc/assets | 2 +- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/.github/workflows/kicad_outputs.yml b/.github/workflows/kicad_outputs.yml index 47d2998..a927fa0 100644 --- a/.github/workflows/kicad_outputs.yml +++ b/.github/workflows/kicad_outputs.yml @@ -33,7 +33,7 @@ jobs: token: ${{ secrets.pat }} ref: ${{ github.head_ref }} - - uses: INTI-CMNB/KiBot@v2_dk6 + - uses: INTI-CMNB/KiBot@v2_dk7 with: config: ${{ env.kibot }}/erc.kibot.yaml schema: ${{ env.schema }} @@ -51,7 +51,7 @@ jobs: token: ${{ secrets.pat }} ref: ${{ github.head_ref }} - - uses: INTI-CMNB/KiBot@v2_dk6 + - uses: INTI-CMNB/KiBot@v2_dk7 with: config: ${{ env.kibot }}/drc.kibot.yaml schema: ${{ env.schema }} @@ -69,7 +69,7 @@ jobs: token: ${{ secrets.pat }} ref: ${{ github.head_ref }} - - uses: INTI-CMNB/KiBot@v2_dk6 + - uses: INTI-CMNB/KiBot@v2_dk7 with: config: ${{ env.kibot }}/schematics.kibot.yaml schema: ${{ env.schema }} @@ -93,30 +93,38 @@ jobs: token: ${{ secrets.pat }} ref: ${{ github.head_ref }} - - uses: INTI-CMNB/KiBot@v2_dk6 + - uses: INTI-CMNB/KiBot@v2_dk7 with: config: ${{ env.kibot }}/placement.kibot.yaml schema: ${{ env.schema }} board: ${{ env.board }} dir: ${{ env.dir }}_docs - - uses: INTI-CMNB/KiBot@v2_dk6 + - uses: INTI-CMNB/KiBot@v2_dk7 with: config: ${{ env.kibot }}/xml.kibot.yaml schema: ${{ env.schema }} board: ${{ env.board }} dir: ${{ env.dir }}_docs - - name: "Rename output" +# - name: "Rename output" +# run: | +# for file in $(find ${{env.dir}} -type f); do sudo mv "${file}" "${file//${{env.project}}/${{env.branch}}}" ; done +# for file in $(find ${{env.dir}}_docs -type f); do sudo mv "${file}" "${file//${{env.project}}/${{env.branch}}}" ; done + + - name: "Collect files" run: | - for file in $(find ${{env.dir}} -type f); do sudo mv "${file}" "${file//${{env.project}}/${{env.branch}}}" ; done - for file in $(find ${{env.dir}}_docs -type f); do sudo mv "${file}" "${file//${{env.project}}/${{env.branch}}}" ; done + tree + mkdir doc_xml || true ; + mv hw/sch_pcb/*.xml doc_xml/ || true; + mv hw/out_docs/*.csv doc_xml/ || true; - uses: actions/upload-artifact@v3 if: ${{ success() }} with: name: doc_xml - path: hw/sch_pcb/*.xml + path: | + doc_xml # Zde se zahazuji debugovaci videa - uses: actions/upload-artifact@v3 @@ -138,7 +146,7 @@ jobs: token: ${{ secrets.pat }} ref: ${{ github.head_ref }} - - uses: INTI-CMNB/KiBot@v2_dk6 + - uses: INTI-CMNB/KiBot@v2_dk7 with: config: ${{ env.kibot }}/report.kibot.yaml schema: ${{ env.schema }} @@ -162,7 +170,7 @@ jobs: token: ${{ secrets.pat }} ref: ${{ github.head_ref }} - - uses: INTI-CMNB/KiBot@v2_dk6 + - uses: INTI-CMNB/KiBot@v2_dk7 with: config: ${{ env.kibot }}/ibom.kibot.yaml schema: ${{ env.schema }} @@ -191,7 +199,7 @@ jobs: token: ${{ secrets.pat }} ref: ${{ github.head_ref }} - - uses: INTI-CMNB/KiBot@v2_dk6 + - uses: INTI-CMNB/KiBot@v2_dk7 with: config: ${{ env.kibot }}/gerbers.kibot.yaml schema: ${{ env.schema }} @@ -220,14 +228,14 @@ jobs: token: ${{ secrets.pat }} ref: ${{ github.head_ref }} - - uses: INTI-CMNB/KiBot@v2_dk6 + - uses: INTI-CMNB/KiBot@v2_dk7 with: config: ${{ env.kibot }}/cad.kibot.yaml schema: ${{ env.schema }} board: ${{ env.board }} dir: ${{ env.dir }}_cad - - uses: INTI-CMNB/KiBot@v2_dk6 + - uses: INTI-CMNB/KiBot@v2_dk7 with: config: ${{ env.kibot }}/render.kibot.yaml schema: ${{ env.schema }} @@ -281,21 +289,21 @@ jobs: mkdir hw || true mkdir hw/cam_profi || true mkdir hw/cam_profi/gbr || true - mkdir hw/cam_profi/PnP || true + mkdir hw/cam_profi/assembly || true mkdir hw/cam_profi/ibom || true - - cp doc/assets/kibot/autogenerated.md hw/cam_profi.readme.md || true - + cp -r doc_img/* doc/gen/img || true cp -r doc_cad/cad/* doc/gen || true - mv -r hw_cam_profi/PnP/* hw/cam_profi/PnP || true cp -r hw_cam_profi/* hw/cam_profi/gbr || true cp -r doc_sch/docs/* doc/gen || true cp -r doc_xml/* hw/cam_profi || true cp -r doc_sch/img/pcb/* doc/gen/img || true - cp -r doc_placement/doc* hw/cam_profi || true + mv -r doc_placement/PnP/* hw/cam_profi/assembly || true + cp -r doc_placement/* hw/cam_profi/assembly || true cp -r doc_report/* doc/gen || true - cp -r doc_ibom/docs/* hw/cam_profi/ibom || true + cp -r doc_ibom/docs/* hw/cam_profi || true + + mv hw/cam_profi/gbr/PnP/ hw/cam_profi/assembly || true rm -r doc_img || true rm -r doc_cad || true @@ -306,8 +314,6 @@ jobs: rm -r doc_report || true rm -r doc_ibom || true - tree - git add . -f - uses: stefanzweifel/git-auto-commit-action@v4.16.0 diff --git a/doc/assets b/doc/assets index 5ace2f6..542d90f 160000 --- a/doc/assets +++ b/doc/assets @@ -1 +1 @@ -Subproject commit 5ace2f6311b09347c2a45a9ea9674b4bd1357793 +Subproject commit 542d90f5eb93246245064e343e4f8c2eafcd4d97