more workflow fixes

mbtaylor1982 · Nov 18, 2024 · 3e15f26 · 3e15f26
1 parent da6d985
commit 3e15f26
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
         username: ${{ secrets.DOCKER_HUB_USER }}
         password: ${{ secrets.DOCKER_HUB_PWD }}
     env:
-      VERSION: ${{ github.ref_name != '' && github.ref_name || 'v9.9' }}
+      VERSION: ${{ startsWith(github.ref_name, 'v') && github.ref_name || 'v9.9'}}
     steps:
       # 1 - Checkout repository
       - name: Checkout repository

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Copy, tag with version and create SHA256 checksum
         run: |
           mkdir -p ../releases
-          cp KiCad_Outputs.zip ../releases/KiCad_Outputs_${{ github.ref_name }}
+          cp -r KiCad_Outputs.zip ../releases/KiCad_Outputs_${{ github.ref_name }}
           cp output_files_10M16_${{ github.ref_name }}.zip/RESDMAC.pof ../releases/RESDMAC_10M16_${{ github.ref_name }}.pof
           cp output_files_10M04_${{ github.ref_name }}.zip/RESDMAC.pof ../releases/RESDMAC_10M04_${{ github.ref_name }}.pof
           cp output_files_10M02_${{ github.ref_name }}.zip/RESDMAC.pof ../releases/RESDMAC_10M02_${{ github.ref_name }}.pof