From cfbc830bc764fe8b412658bf5f678c2e922a8773 Mon Sep 17 00:00:00 2001 From: phlax Date: Tue, 1 Oct 2024 16:38:31 +0100 Subject: [PATCH] github/ci: Fix verify artefacts (#36406) Signed-off-by: Ryan Northey --- .github/workflows/_publish_verify.yml | 4 +++- .github/workflows/_run.yml | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/_publish_verify.yml b/.github/workflows/_publish_verify.yml index d4838c34422d..2f95ee550401 100644 --- a/.github/workflows/_publish_verify.yml +++ b/.github/workflows/_publish_verify.yml @@ -99,10 +99,11 @@ jobs: export NO_BUILD_SETUP=1 export ENVOY_DOCKER_IN_DOCKER=1 target: ${{ matrix.target }} + target-suffix: ${{ matrix.arch }} trusted: ${{ inputs.trusted }} steps-pre: | - run: | - echo ARCH=${{ matrix.arch || 'x64' }} >> $GITHUB_ENV + echo ARCH=${{ matrix.arch }} >> $GITHUB_ENV echo DEB_ARCH=${{ matrix.arch == 'arm64' && 'arm64' || 'amd64' }} >> $GITHUB_ENV shell: bash - run: | @@ -124,6 +125,7 @@ jobs: - name: verify_distro_x64 target: verify_distro + arch: x64 rbe: true - name: verify_distro_arm64 diff --git a/.github/workflows/_run.yml b/.github/workflows/_run.yml index a7cd82adcfce..1c9766d19dc2 100644 --- a/.github/workflows/_run.yml +++ b/.github/workflows/_run.yml @@ -298,7 +298,11 @@ jobs: fail-match: ${{ inputs.fail-match }} notice-match: ${{ inputs.notice-match }} output-path: ${{ inputs.output-path }} - report-name: ci-report-${{ inputs.target-suffix && format('{0}-', inputs.target-suffix) || '' }}${{ inputs.target-name || inputs.target }}.json + report-name: >- + ci-report-${{ + inputs.target-suffix + && format('{0}-', inputs.target-suffix) + || '' }}${{ inputs.target-name || inputs.target }}.json report-pre: ${{ inputs.report-pre }} report-post: ${{ inputs.report-post }} source: ${{ inputs.source }}