Fix actions problems

tmshader · Dec 6, 2024 · 17f7039 · 17f7039
1 parent fe028e4
commit 17f7039
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git a/.github/workflows/deploy-without-kibot.yml b/.github/workflows/deploy-without-kibot.yml
@@ -33,6 +33,14 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           run-id: ${{ inputs.run_id }}
 
+      - name: Download artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: artsey_ergo
+          path: output
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-id: ${{ inputs.run_id }}
+
       - name: Move artifact files
         run: |
           ls -l
@@ -46,6 +54,8 @@ jobs:
           mkdir documents
           mv output/drc_validation.md ./
           mv output/erc_validation.md ./
+          mv output/artsey_ergo-erc.html ./
+          mv output/artsey_ergo-drc.html ./
           mv output/step/Step/artsey_ergo-3D.step ./artsey_ergo-3D.step
           mv output/report/report/artsey_ergo-report.txt ./artsey_ergo-report.md
           mv output/render_top/artsey_ergo-3D_blender_top.png images/artsey_ergo-3D_blender_top.png
@@ -66,14 +76,6 @@ jobs:
           ls -l export
           find .
 
-      - name: Download artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: artsey_ergo
-          path: output
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          run-id: ${{ inputs.run_id }}
-
       - name: Setup Pages
         uses: actions/configure-pages@v5
 

diff --git a/.github/workflows/kibot.yml b/.github/workflows/kibot.yml
@@ -59,7 +59,7 @@ jobs:
           cat <<EOF > output/erc_validation.md
           - **Errors**: $erc_errors
           - **Warnings**: $erc_warnings
-          - **Link**: [HTML Report](output/artsey_ergo-erc.html)
+          - **Link**: [HTML Report](artsey_ergo-erc.html)
           EOF
           cat output/erc_validation.md
 
@@ -70,7 +70,7 @@ jobs:
           cat <<EOF > output/drc_validation.md
           - **Errors**: $drc_errors
           - **Warnings**: $drc_warnings
-          - **Link**: [HTML Report](output/artsey_ergo-drc.html)
+          - **Link**: [HTML Report](artsey_ergo-drc.html)
           EOF
           cat output/drc_validation.md
 
@@ -353,6 +353,12 @@ jobs:
         with:
           path: output
 
+      - name: Download artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: artsey_ergo
+          path: output
+
       - name: Move artifact files
         run: |
           ls -l
@@ -366,6 +372,8 @@ jobs:
           mkdir documents
           mv output/drc_validation.md ./
           mv output/erc_validation.md ./
+          mv output/artsey_ergo-erc.html ./
+          mv output/artsey_ergo-drc.html ./
           mv output/step/Step/artsey_ergo-3D.step ./artsey_ergo-3D.step
           mv output/report/report/artsey_ergo-report.txt ./artsey_ergo-report.md
           mv output/render_top/artsey_ergo-3D_blender_top.png images/artsey_ergo-3D_blender_top.png
@@ -386,12 +394,6 @@ jobs:
           ls -l export
           find .
 
-      - name: Download artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: artsey_ergo
-          path: output
-
       - name: Setup Pages
         uses: actions/configure-pages@v5