diff --git a/.github/workflows/vrt-update-generate.yml b/.github/workflows/vrt-update-generate.yml index a7156fe7f0..a4c5fb7565 100644 --- a/.github/workflows/vrt-update-generate.yml +++ b/.github/workflows/vrt-update-generate.yml @@ -264,8 +264,11 @@ jobs: git config --global user.name "github-actions[bot]" git config --global user.email "github-actions[bot]@users.noreply.github.com" - shopt -s nullglob - patches=(/tmp/shard-patches/*/vrt-shard.patch) + # actions/download-artifact puts a lone matched artifact directly in + # `path` but gives each of several its own `path//` subdir, so + # recurse instead of globbing `*/vrt-shard.patch` (which would miss + # the common single-shard case). + mapfile -t patches < <(find /tmp/shard-patches -type f -name 'vrt-shard.patch' | sort) if [ ${#patches[@]} -eq 0 ]; then echo "has_changes=false" >> "$GITHUB_OUTPUT" diff --git a/upcoming-release-notes/7802.md b/upcoming-release-notes/7802.md new file mode 100644 index 0000000000..a38475cbd9 --- /dev/null +++ b/upcoming-release-notes/7802.md @@ -0,0 +1,6 @@ +--- +category: Maintenance +authors: [MatissJanis] +--- + +Fix `/update-vrt` screenshot merge operation when exactly one patch is generated