Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions .github/workflows/build-reusable.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
5 changes: 2 additions & 3 deletions .github/workflows/nightly-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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
Expand All @@ -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 }}"
Expand Down