diff --git a/.github/workflows/pathogen-repo-ci.yaml b/.github/workflows/pathogen-repo-ci.yaml index 7926a68..71149f9 100644 --- a/.github/workflows/pathogen-repo-ci.yaml +++ b/.github/workflows/pathogen-repo-ci.yaml @@ -74,15 +74,20 @@ on: artifact-name: description: >- - Name to use for build results artifact uploaded at the end of the - workflow. This name will be suffixed with other information from the - workflow job matrix to distinguish each artifact in a workflow run. + A base name to use for the uploaded artifacts from the + build. This will be concatenated with the directory name + used to invoke the build to generate the full artifact file + name. - If you're invoking this workflow multiple times from the same calling - workflow, you should set this. Otherwise, the default of "outputs" - is probably fine. + Defaults to `ci-outputs`. + + N.b., you almost certainly don't need to change this, unless + you're running multiple invocations of this action in a + single workflow. Then you should provide unique values to + ensure you can access the artifacts from all the builds + you're doing. type: string - default: outputs + default: ci-outputs required: false continue-on-error: @@ -244,15 +249,18 @@ jobs: with: directory: ingest runtime: ${{ matrix.runtime }} + artifact-name: ${{ inputs.artifact-name }} - name: Run phylogenetic uses: ./.git/nextstrain/.github/actions/run-nextstrain-ci-build with: directory: phylogenetic runtime: ${{ matrix.runtime }} + artifact-name: ${{ inputs.artifact-name }} - name: Run nextclade uses: ./.git/nextstrain/.github/actions/run-nextstrain-ci-build with: directory: nextclade runtime: ${{ matrix.runtime }} + artifact-name: ${{ inputs.artifact-name }} diff --git a/actions/run-nextstrain-ci-build/action.yaml b/actions/run-nextstrain-ci-build/action.yaml index 0c2e115..66cf141 100644 --- a/actions/run-nextstrain-ci-build/action.yaml +++ b/actions/run-nextstrain-ci-build/action.yaml @@ -11,6 +11,12 @@ description: >- the context of that specific workflow. inputs: + artifact-name: + description: >- + Name to append to the build directory to generate a + unique artifact name for the upload action. + type: string + required: true directory: description: The name of the sub-directory to run the build from type: string @@ -42,7 +48,7 @@ runs: if: always() uses: actions/upload-artifact@v4 with: - name: ci-outputs-${{ inputs.directory }}-${{ inputs.runtime }} + name: ${{ inputs.artifact-name }}-${{ inputs.directory }}-${{ inputs.runtime }} if-no-files-found: ignore path: | ${{ inputs.directory }}/.snakemake/log/