fix assets and artifacts naming and handling (#49)

CBDD · Nov 24, 2023 · d6fd39c · d6fd39c
1 parent d0b7c93
commit d6fd39c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/build_generic.yml b/.github/workflows/build_generic.yml
@@ -39,15 +39,14 @@ jobs:
 
     - name: Set candidate name
       id: set_candidate_name
-      run: echo "CANDIDATE_NAME=$(date +%y.%m).${{ github.event.number }}_${{ inputs.distribution }}_${{ inputs.compiler }}_${{ inputs.arch }}" >> "$GITHUB_OUTPUT"
+      run: echo "CANDIDATE_NAME=$(date +%y.%m).${{ github.run_number }}_${{ inputs.distribution }}_${{ inputs.compiler }}_${{ inputs.arch }}" >> "$GITHUB_OUTPUT"
 
     - name: Create bundle
       run: |
-        tar -czvf rdock.tar.gz \
+        tar -czvf rdock-${{ steps.set_candidate_name.outputs.CANDIDATE_NAME }}.tar.gz \
           bin/ lib/ include/ data/ scripts/ Makefile license.txt README.md old_README.md
 
     - name: Upload bundle
       uses: actions/upload-artifact@v3
       with:
-        name: rdock-${{ steps.set_candidate_name.outputs.CANDIDATE_NAME }}.tar.gz
-        path: rdock.tar.gz
+        path: rdock-${{ steps.set_candidate_name.outputs.CANDIDATE_NAME }}.tar.gz
diff --git a/.github/workflows/build_matrix.yml b/.github/workflows/build_matrix.yml
@@ -61,4 +61,4 @@ jobs:
       uses: ncipollo/release-action@v1
       with:
         tag: v${{ steps.set_version.outputs.RELEASE_VERSION }}
-        artifacts: artifacts/*.tar.gz
+        artifacts: artifacts/*/*.tar.gz