fix nightly release; more flexible reusable build

Signed-off-by: Avi Deitcher <[email protected]>

Author: deitch

.github/workflows/build-reusable.yaml

@@ -4,8 +4,7 @@ on:
   workflow_call:
     inputs:
       artifact-name:
-        description: "Named identifier for the artifact"
-        required: true
+        description: "Named identifier for the artifact, optional"
         type: string
       os:
         description: "OS list"
@@ -166,9 +165,16 @@ jobs:
             *)
               MODE="elf";;
           esac
-          echo "TOOLCHAIN_NAME=riscv$BITS-$MODE-${{ matrix.os }}-${{ matrix.compiler }}-${{ inputs.artifact-name }}" >> $GITHUB_OUTPUT
+          ARTIFACT_NAME=${{ inputs.artifact-name }}
+          if [ -n "$ARTIFACT_NAME" ]; then
+            ARTIFACT_NAME="-${ARTIFACT_NAME}"
+          fi
+          echo "TOOLCHAIN_NAME=riscv$BITS-$MODE-${{ matrix.os }}-${{ matrix.compiler }}${ARTIFACT_NAME}" >> $GITHUB_OUTPUT
 
+      - name: Move output to representative name
+        run: |
+          mv riscv.tar.xz ${{ steps.toolchain-name-generator.outputs.TOOLCHAIN_NAME }}.tar.xz
       - uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.toolchain-name-generator.outputs.TOOLCHAIN_NAME }}
-          path: riscv.tar.xz
+          path: ${{ steps.toolchain-name-generator.outputs.TOOLCHAIN_NAME }}.tar.xz

.github/workflows/nightly-release.yaml

@@ -55,8 +55,6 @@ jobs:
     needs: [activity-check]
     if: needs.activity-check.outputs.stale != 'true'
     uses: ./.github/workflows/build-reusable.yaml
-    with:
-      artifact-name: nightly
 
   create-release:
     needs: [build]
@@ -65,7 +63,7 @@ jobs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
       datestamp: ${{ env.DATESTAMP }}
     env:
-      ARTIFACTS_DIR: /mnt/artifacts/
+      ARTIFACTS_DIR: artifacts
     steps:
       - name:  Run Configuration Commands
         id: metadata
@@ -81,6 +79,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           path: ${{ env.ARTIFACTS_DIR }}
+          merge-multiple: true
       - name: List downloaded artifacts
         run: |
           echo "Contents of ${{ env.ARTIFACTS_DIR }}"