From e8c26e0b2154bfad53b32cc29c3021e4ef9a192f Mon Sep 17 00:00:00 2001 From: Stephen Hawes Date: Fri, 9 Jun 2023 12:42:01 -0400 Subject: [PATCH] rearranges step in ci to test before stl generation to save time --- .github/workflows/export-bom.yaml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/export-bom.yaml b/.github/workflows/export-bom.yaml index ff50f46..2979a53 100644 --- a/.github/workflows/export-bom.yaml +++ b/.github/workflows/export-bom.yaml @@ -144,7 +144,17 @@ jobs: - name: Generate BOM HTML Page for Workflow Dispatch if: github.event_name != 'release' run: | - python3 .github/workflows/scripts/export-bom.py ${SHORT_SHA} + python3 .github/workflows/scripts/export-bom.py ${SHORT_SHA} + + - name: Download PCB Images + uses: actions/download-artifact@v2 + with: + name: pcb-images + + - name: Unzip PCB Images + run: | + mkdir pcb-images + unzip pcb-images.zip -d ./pcb-images - name: Install FreeCAD Python library run: | @@ -200,21 +210,16 @@ jobs: export DISPLAY=:5 python3 .github/workflows/scripts/generate-stl-img.py ${SHORT_SHA} - - name: Download PCB Images - uses: actions/download-artifact@v2 - with: - name: pcb-images - - name: Zip BOM Directory for Workflow Dispatch if: github.event_name != 'release' run: | - zip -r Feeder-BOM.zip Feeder-${SHORT_SHA} Feeder-${SHORT_SHA}/img /home/runner/work/feeder/feeder/pcb-images.zip + zip -r Feeder-BOM.zip Feeder-${SHORT_SHA} Feeder-${SHORT_SHA}/img ./pcb-images ls -al - name: Zip BOM Directory for Release if: github.event_name == 'release' run: | - zip -r Feeder-BOM-${{ github.event.release.tag_name }}.zip Feeder-${{ github.event.release.tag_name }} Feeder-${{ github.event.release.tag_name }}/img pcb-images + zip -r Feeder-BOM-${{ github.event.release.tag_name }}.zip Feeder-${{ github.event.release.tag_name }} Feeder-${{ github.event.release.tag_name }}/img ./pcb-images - name: Upload BOM results if: github.event_name != 'release'