Skip to content

Commit 186098c

Browse files
authored
ci: fix the ExecuTorch runtime artifact name collapsing to one name (#4553)
1 parent 2c9bed5 commit 186098c

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

.github/workflows/executorch-build-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
build-matrix: ${{ needs.filter-matrix.outputs.matrix }}
5757
pre-script: packaging/pre_build_script.sh
5858
fail-on-empty: false
59-
upload-artifact: torch-tensorrt-executorch-runtime-${{ matrix.python_version }}-${{ matrix.desired_cuda }}-${{ inputs.architecture }}
59+
upload-artifact: torch-tensorrt-executorch-runtime
6060
script: |
6161
set -euo pipefail
6262
BAZELISK_VERSION="1.26.0"

.github/workflows/executorch-test-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
test-infra-ref: ${{ inputs.test-infra-ref }}
5656
build-matrix: ${{ needs.filter-matrix.outputs.matrix }}
5757
pre-script: packaging/pre_build_script.sh
58-
additional-artifact: torch-tensorrt-executorch-runtime-${{ matrix.python_version }}-${{ matrix.desired_cuda }}-${{ inputs.architecture }}
58+
additional-artifact: torch-tensorrt-executorch-runtime
5959
script: |
6060
set -euo pipefail
6161
mkdir -p "${RUNNER_TEMP}/bin"

.github/workflows/linux-test.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ on:
5050
default: false
5151
type: boolean
5252
upload-artifact:
53-
description: 'Name to give wheel artifacts uploaded from the repository dist directory'
53+
description: 'Name prefix for wheel artifacts uploaded from the repository dist directory. This workflow appends -<python_version>-<desired_cuda>-<architecture>, plus -python-only and -rtx when those inputs are set. Rows that differ only in matrix.tensorrt.version are not separated by it.'
5454
default: ''
5555
type: string
5656
additional-artifact:
57-
description: "Optional additional artifact to install alongside the core wheel"
57+
description: "Name prefix of an optional additional artifact to install alongside the core wheel. The same suffix is appended, so it lines up with what upload-artifact produced when both calls are given the same build matrix and the same architecture."
5858
default: ""
5959
type: string
6060
use-rtx:
@@ -94,6 +94,10 @@ jobs:
9494
ARCH: ${{ inputs.architecture }}
9595
USE_TRT_RTX: ${{ inputs.use-rtx }}
9696
DOWNLOAD_ARTIFACT_NAME: pytorch_tensorrt_${{ matrix.tensorrt.version }}_${{ matrix.python_version }}_${{ matrix.desired_cuda }}_${{ inputs.architecture }}${{ inputs.python-only && '_python_only' || '' }}${{ inputs.use-rtx && '_rtx' || '' }}
97+
# matrix.* and inputs.architecture are out of scope at a workflow_call site, so a
98+
# per-row suffix can only be built here. The stem stays with the caller, and the
99+
# producer and the consumer have to pass the same one.
100+
ARTIFACT_NAME_SUFFIX: ${{ matrix.python_version }}-${{ matrix.desired_cuda }}-${{ inputs.architecture }}${{ inputs.python-only && '-python-only' || '' }}${{ inputs.use-rtx && '-rtx' || '' }}
97101
name: ${{ inputs.job-name }}-${{ matrix.tensorrt.version }}-${{ matrix.python_version }}-${{ matrix.desired_cuda }}
98102
runs-on: ${{ inputs.runner != '' && inputs.runner || matrix.validation_runner }}
99103
container:
@@ -168,7 +172,7 @@ jobs:
168172
if: ${{ inputs.additional-artifact != '' }}
169173
uses: actions/download-artifact@v7
170174
with:
171-
name: ${{ inputs.additional-artifact }}
175+
name: ${{ inputs.additional-artifact }}-${{ env.ARTIFACT_NAME_SUFFIX }}
172176
path: /opt/torch-tensorrt-builds/
173177
- name: Pack script
174178
continue-on-error: ${{ inputs.continue-on-error }}
@@ -226,7 +230,7 @@ jobs:
226230
uses: actions/upload-artifact@v6
227231
if: ${{ inputs.upload-artifact != '' }}
228232
with:
229-
name: ${{ inputs.upload-artifact }}
233+
name: ${{ inputs.upload-artifact }}-${{ env.ARTIFACT_NAME_SUFFIX }}
230234
path: ${{ inputs.repository }}/dist/
231235
if-no-files-found: error
232236

0 commit comments

Comments
 (0)