From d9c590bf54d45879bcbf8accb4e33abcf6e656b5 Mon Sep 17 00:00:00 2001 From: Matt Fiddaman Date: Wed, 12 Nov 2025 13:33:16 +0000 Subject: [PATCH] fix VRT workflow artifact download (#6126) --- .github/workflows/vrt-update-apply.yml | 15 +++++---------- upcoming-release-notes/6126.md | 6 ++++++ 2 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 upcoming-release-notes/6126.md diff --git a/.github/workflows/vrt-update-apply.yml b/.github/workflows/vrt-update-apply.yml index 38c7948d98..e2bdde9417 100644 --- a/.github/workflows/vrt-update-apply.yml +++ b/.github/workflows/vrt-update-apply.yml @@ -37,17 +37,14 @@ jobs: - name: Extract metadata id: metadata run: | - # Find the metadata directory (will be vrt-metadata-{PR_NUMBER}) - METADATA_DIR=$(find /tmp/metadata -mindepth 1 -maxdepth 1 -type d | head -n 1) - - if [ -z "$METADATA_DIR" ]; then + if [ ! -f "/tmp/metadata/pr-number.txt" ]; then echo "No metadata found, skipping..." exit 0 fi - PR_NUMBER=$(cat "$METADATA_DIR/pr-number.txt") - HEAD_REF=$(cat "$METADATA_DIR/head-ref.txt") - HEAD_REPO=$(cat "$METADATA_DIR/head-repo.txt") + PR_NUMBER=$(cat "/tmp/metadata/pr-number.txt") + HEAD_REF=$(cat "/tmp/metadata/head-ref.txt") + HEAD_REPO=$(cat "/tmp/metadata/head-repo.txt") echo "pr_number=$PR_NUMBER" >> "$GITHUB_OUTPUT" echo "head_ref=$HEAD_REF" >> "$GITHUB_OUTPUT" @@ -68,9 +65,7 @@ jobs: if: steps.metadata.outputs.pr_number != '' id: apply run: | - # Find the patch file - PATCH_DIR=$(find /tmp/artifacts -mindepth 1 -maxdepth 1 -type d | head -n 1) - PATCH_FILE="$PATCH_DIR/vrt-update.patch" + PATCH_FILE="/tmp/artifacts/vrt-update.patch" if [ ! -f "$PATCH_FILE" ]; then echo "No patch file found" diff --git a/upcoming-release-notes/6126.md b/upcoming-release-notes/6126.md new file mode 100644 index 0000000000..77c1ae0fea --- /dev/null +++ b/upcoming-release-notes/6126.md @@ -0,0 +1,6 @@ +--- +category: Maintenance +authors: [matt-fidd] +--- + +Fix VRT workflow artifact download