Fix release naming

concordia-fsae · May 14, 2024 · 994b1ef · 994b1ef
1 parent 05b70a0
commit 994b1ef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/.github/actions/archive/action.yml b/.github/actions/archive/action.yml
@@ -24,12 +24,13 @@ runs:
         [[ -z $sha_short ]] && sha_short="unknown"
         echo "sha_short=$sha_short" >> "$GITHUB_OUTPUT"
 
-        if [[ ${{ startsWith(github.ref, 'refs/tags/v') }} ]]; then
+        echo "github_ref: ${{ github.ref }}"
+        if [[ ${{ github.ref }} =~ refs/tags/v[0-9]+\.[0-9]+\.[0-9]+ ]]; then
           export archive_name="conUDS_${{ github.ref_name }}_${{ inputs.target }}.zip"
         else
           export archive_name="conUDS_${sha_short}_${{ inputs.target }}.zip"
         fi
-        echo "archive_name=$archive_name"  >> "$GITHUB_OUTPUT"
+        echo "archive_name=$archive_name" >> "$GITHUB_OUTPUT"
 
         cat "$GITHUB_OUTPUT"
 

diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
@@ -22,21 +22,16 @@ jobs:
           export sha_short=$(git rev-parse --short "$GITHUB_SHA")
           [[ -z $sha_short ]] && sha_short="unknown"
           echo "sha_short=$sha_short" >> "$GITHUB_ENV"
-      - uses: actions/upload-artifact@v3
-        with:
-          name: conUDS_${{ env.sha_short }}
-          path: |
-            ./conUDS/assets
-            ./conUDS/conUDS
-          if-no-files-found: error
       - name: Generate Archive Checksum
         shell: bash
         run: |
           sha256sum ./conUDS/conUDS >> CHECKSUM
           sha256sum ./conUDS/assets/nodes.yml >> CHECKSUM
       - uses: actions/upload-artifact@v3
         with:
-          name: CHECKSUM
+          name: conUDS_${{ env.sha_short }}
           path: |
+            ./conUDS/assets
+            ./conUDS/conUDS
             ./CHECKSUM
           if-no-files-found: error