mirror of
https://github.com/block/buzz.git
synced 2026-08-18 06:50:31 +02:00
fix(release): resolve Windows sidecar path and Linux AppImage updater format (#1024)
Signed-off-by: Will Pfleger <pfleger.will@gmail.com> Co-authored-by: npub1mn7jgtj4w2pd0g0zeuhxsa6jy6p0rewxz4kujt98my82ahfmp72sxjexk7 <dcfd242e557282d7a1e2cf2e6877522682f1e5c6156dc92ca7d90eaedd3b0f95@sprout-oss.stage.blox.sqprod.co>
This commit is contained in:
co-authored by
npub1mn7jgtj4w2pd0g0zeuhxsa6jy6p0rewxz4kujt98my82ahfmp72sxjexk7
parent
29b8f73b08
commit
c7dd4295b8
@@ -504,9 +504,16 @@ jobs:
|
||||
fi
|
||||
echo "appimage=$APPIMAGE" >> "$GITHUB_OUTPUT"
|
||||
|
||||
# Updater archive: Tauri emits <name>.AppImage.tar.gz + .sig when signing is enabled
|
||||
# Updater archive: Tauri 2.11+ with createUpdaterArtifacts signs the
|
||||
# AppImage directly (*.AppImage + *.AppImage.sig). Earlier versions
|
||||
# wrapped it in a tar.gz. Try the new format first, fall back to legacy.
|
||||
ARCHIVE=$(find "$BUNDLE_DIR/appimage" -name '*.AppImage.tar.gz' ! -name '*.sig' -type f | head -1)
|
||||
SIG="${ARCHIVE}.sig"
|
||||
if [[ -n "$ARCHIVE" ]]; then
|
||||
SIG="${ARCHIVE}.sig"
|
||||
else
|
||||
ARCHIVE="$APPIMAGE"
|
||||
SIG="${APPIMAGE}.sig"
|
||||
fi
|
||||
if [[ -z "$ARCHIVE" || ! -f "$SIG" ]]; then
|
||||
echo "::error::AppImage updater archive or signature not found in $BUNDLE_DIR/appimage"
|
||||
exit 1
|
||||
|
||||
@@ -6,12 +6,14 @@ HOST=$(rustc -vV | sed -n 's|host: ||p')
|
||||
TARGET=${1:-$HOST}
|
||||
BINARIES_DIR="desktop/src-tauri/binaries"
|
||||
|
||||
# A cross-target build (`cargo build --target <triple>`) emits to
|
||||
# target/<triple>/release; a host build emits to target/release.
|
||||
if [[ "$TARGET" == "$HOST" ]]; then
|
||||
SRC_DIR="target/release"
|
||||
else
|
||||
# When --target is passed explicitly to cargo (even if it matches the host),
|
||||
# binaries land in target/<triple>/release/. Without --target, they land in
|
||||
# target/release/. The script receives the target as $1 only when cargo was
|
||||
# invoked with --target, so use the qualified path whenever $1 is set.
|
||||
if [[ -n "${1:-}" ]]; then
|
||||
SRC_DIR="target/${TARGET}/release"
|
||||
else
|
||||
SRC_DIR="target/release"
|
||||
fi
|
||||
|
||||
# MSVC emits <name>.exe; Tauri's externalBin then expects binaries/<name>-<triple>.exe.
|
||||
|
||||
Reference in New Issue
Block a user