From cc785a58eca80ba4f8231ed0c953f9c1b313c934 Mon Sep 17 00:00:00 2001 From: Stephen Hawes Date: Fri, 9 Jun 2023 17:45:28 -0400 Subject: [PATCH] Update export-bom.yaml changes order so img folder already exists --- .github/workflows/export-bom.yaml | 63 ++++++++++++++++--------------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/.github/workflows/export-bom.yaml b/.github/workflows/export-bom.yaml index 135adbf..91ae71b 100644 --- a/.github/workflows/export-bom.yaml +++ b/.github/workflows/export-bom.yaml @@ -145,37 +145,6 @@ jobs: if: github.event_name != 'release' run: | python3 .github/workflows/scripts/export-bom.py ${SHORT_SHA} - - - name: Make folder to Host PCB Images - run: | - mkdir pcb-images - ls -al - cd pcb-images - ls -al - - - name: Download PCB Images - if: github.event_name != 'release' - uses: actions/download-artifact@v2 - with: - name: pcb-images - path: pcb-images/ - - - name: Move PCB Images for Workflow Dispatch - if: github.event_name != 'release' - run: | - ls -al - ls -al pcb-images - mv pcb-images/*.png Feeder-${SHORT_SHA}/img/ - ls -al Feeder-${SHORT_SHA}/img/ - - - name: Move PCB Images for Release - if: github.event_name == 'release' - run: | - ls -al - ls -al pcb-images - mv pcb-images/* Feeder-${{ github.event.release.tag_name }}/img/ - ls -al Feeder-${{ github.event.release.tag_name }}/img/ - - name: Install FreeCAD Python library run: | @@ -230,6 +199,38 @@ jobs: Xvfb :5 -screen 0 800x600x24 & export DISPLAY=:5 python3 .github/workflows/scripts/generate-stl-img.py ${SHORT_SHA} + + + - name: Make folder to Host PCB Images + run: | + mkdir pcb-images + ls -al + cd pcb-images + ls -al + + - name: Download PCB Images + if: github.event_name != 'release' + uses: actions/download-artifact@v2 + with: + name: pcb-images + path: pcb-images/ + + - name: Move PCB Images for Workflow Dispatch + if: github.event_name != 'release' + run: | + ls -al + ls -al pcb-images + mv pcb-images/*.png Feeder-${SHORT_SHA}/img/ + ls -al Feeder-${SHORT_SHA}/img/ + + - name: Move PCB Images for Release + if: github.event_name == 'release' + run: | + ls -al + ls -al pcb-images + mv pcb-images/* Feeder-${{ github.event.release.tag_name }}/img/ + ls -al Feeder-${{ github.event.release.tag_name }}/img/ + - name: Zip BOM Directory for Workflow Dispatch if: github.event_name != 'release'