From 135a8a0adf4117c2b95ad0527b4cff91475b579c Mon Sep 17 00:00:00 2001 From: lucaronin Date: Fri, 24 Apr 2026 19:48:56 +0200 Subject: [PATCH] fix: handle nested release artifacts --- .github/workflows/release-stable.yml | 18 ++++++++++++++---- .github/workflows/release.yml | 10 ++++++++-- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-stable.yml b/.github/workflows/release-stable.yml index a32eaa95..cd7ec449 100644 --- a/.github/workflows/release-stable.yml +++ b/.github/workflows/release-stable.yml @@ -509,17 +509,17 @@ jobs: ARM_TARBALL=$(basename "$ARM_UPDATER_FILE") ARM_DMG=$(basename "$(find_required "dmg-aarch64/*.dmg")") - LINUX_SIG_FILE=$(find_required "linux-x86_64-bundles/*.AppImage.sig" "linux-x86_64-bundles/*.AppImage.tar.gz.sig") + LINUX_SIG_FILE=$(find_required "linux-x86_64-bundles/*/*.AppImage.sig" "linux-x86_64-bundles/*/*.AppImage.tar.gz.sig" "linux-x86_64-bundles/*.AppImage.sig" "linux-x86_64-bundles/*.AppImage.tar.gz.sig") LINUX_UPDATER_FILE="${LINUX_SIG_FILE%.sig}" LINUX_SIG=$(cat "$LINUX_SIG_FILE") LINUX_UPDATER=$(basename "$LINUX_UPDATER_FILE") - LINUX_DOWNLOAD=$(basename "$(find_required "linux-x86_64-bundles/*.AppImage" "linux-x86_64-bundles/*.deb" "linux-x86_64-bundles/*.AppImage.tar.gz")") + LINUX_DOWNLOAD=$(basename "$(find_required "linux-x86_64-bundles/*/*.AppImage" "linux-x86_64-bundles/*/*.deb" "linux-x86_64-bundles/*/*.AppImage.tar.gz" "linux-x86_64-bundles/*.AppImage" "linux-x86_64-bundles/*.deb" "linux-x86_64-bundles/*.AppImage.tar.gz")") - WINDOWS_SIG_FILE=$(find_required "windows-x86_64-bundles/*-setup.exe.sig" "windows-x86_64-bundles/*.msi.sig" "windows-x86_64-bundles/*.nsis.zip.sig" "windows-x86_64-bundles/*.msi.zip.sig") + WINDOWS_SIG_FILE=$(find_required "windows-x86_64-bundles/*/*-setup.exe.sig" "windows-x86_64-bundles/*/*.msi.sig" "windows-x86_64-bundles/*/*.nsis.zip.sig" "windows-x86_64-bundles/*/*.msi.zip.sig" "windows-x86_64-bundles/*-setup.exe.sig" "windows-x86_64-bundles/*.msi.sig" "windows-x86_64-bundles/*.nsis.zip.sig" "windows-x86_64-bundles/*.msi.zip.sig") WINDOWS_UPDATER_FILE="${WINDOWS_SIG_FILE%.sig}" WINDOWS_SIG=$(cat "$WINDOWS_SIG_FILE") WINDOWS_UPDATER=$(basename "$WINDOWS_UPDATER_FILE") - WINDOWS_DOWNLOAD=$(basename "$(find_required "windows-x86_64-bundles/*-setup.exe" "windows-x86_64-bundles/*.msi" "windows-x86_64-bundles/*.nsis.zip" "windows-x86_64-bundles/*.msi.zip")") + WINDOWS_DOWNLOAD=$(basename "$(find_required "windows-x86_64-bundles/*/*-setup.exe" "windows-x86_64-bundles/*/*.msi" "windows-x86_64-bundles/*/*.nsis.zip" "windows-x86_64-bundles/*/*.msi.zip" "windows-x86_64-bundles/*-setup.exe" "windows-x86_64-bundles/*.msi" "windows-x86_64-bundles/*.nsis.zip" "windows-x86_64-bundles/*.msi.zip")") cat > stable-latest.json << EOF { @@ -563,12 +563,22 @@ jobs: linux-x86_64-bundles/*.AppImage linux-x86_64-bundles/*.AppImage.tar.gz linux-x86_64-bundles/*.AppImage.tar.gz.sig + linux-x86_64-bundles/*/*.deb + linux-x86_64-bundles/*/*.AppImage + linux-x86_64-bundles/*/*.AppImage.tar.gz + linux-x86_64-bundles/*/*.AppImage.tar.gz.sig windows-x86_64-bundles/*.exe windows-x86_64-bundles/*.exe.sig windows-x86_64-bundles/*.msi windows-x86_64-bundles/*.msi.sig windows-x86_64-bundles/*.zip windows-x86_64-bundles/*.zip.sig + windows-x86_64-bundles/*/*.exe + windows-x86_64-bundles/*/*.exe.sig + windows-x86_64-bundles/*/*.msi + windows-x86_64-bundles/*/*.msi.sig + windows-x86_64-bundles/*/*.zip + windows-x86_64-bundles/*/*.zip.sig stable-latest.json # ───────────────────────────────────────────────────────────── diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 506b5a6a..285b6558 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -494,11 +494,11 @@ jobs: ARM_SIG=$(cat "$ARM_SIG_FILE") ARM_UPDATER=$(basename "$ARM_UPDATER_FILE") - WINDOWS_SIG_FILE=$(find_required "windows-x86_64-bundles/*-setup.exe.sig" "windows-x86_64-bundles/*.msi.sig" "windows-x86_64-bundles/*.nsis.zip.sig" "windows-x86_64-bundles/*.msi.zip.sig") + WINDOWS_SIG_FILE=$(find_required "windows-x86_64-bundles/*/*-setup.exe.sig" "windows-x86_64-bundles/*/*.msi.sig" "windows-x86_64-bundles/*/*.nsis.zip.sig" "windows-x86_64-bundles/*/*.msi.zip.sig" "windows-x86_64-bundles/*-setup.exe.sig" "windows-x86_64-bundles/*.msi.sig" "windows-x86_64-bundles/*.nsis.zip.sig" "windows-x86_64-bundles/*.msi.zip.sig") WINDOWS_UPDATER_FILE="${WINDOWS_SIG_FILE%.sig}" WINDOWS_SIG=$(cat "$WINDOWS_SIG_FILE") WINDOWS_UPDATER=$(basename "$WINDOWS_UPDATER_FILE") - WINDOWS_DOWNLOAD=$(basename "$(find_required "windows-x86_64-bundles/*-setup.exe" "windows-x86_64-bundles/*.msi" "windows-x86_64-bundles/*.nsis.zip" "windows-x86_64-bundles/*.msi.zip")") + WINDOWS_DOWNLOAD=$(basename "$(find_required "windows-x86_64-bundles/*/*-setup.exe" "windows-x86_64-bundles/*/*.msi" "windows-x86_64-bundles/*/*.nsis.zip" "windows-x86_64-bundles/*/*.msi.zip" "windows-x86_64-bundles/*-setup.exe" "windows-x86_64-bundles/*.msi" "windows-x86_64-bundles/*.nsis.zip" "windows-x86_64-bundles/*.msi.zip")") cat > alpha-latest.json << EOF { @@ -538,6 +538,12 @@ jobs: windows-x86_64-bundles/*.msi.sig windows-x86_64-bundles/*.zip windows-x86_64-bundles/*.zip.sig + windows-x86_64-bundles/*/*.exe + windows-x86_64-bundles/*/*.exe.sig + windows-x86_64-bundles/*/*.msi + windows-x86_64-bundles/*/*.msi.sig + windows-x86_64-bundles/*/*.zip + windows-x86_64-bundles/*/*.zip.sig alpha-latest.json # ─────────────────────────────────────────────────────────────