tracer/iKeyMon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 12 Wiki Activity

Sparkle fixes

Browse Source
This commit is contained in:
Micha
2025-12-07 16:52:13 +01:00
parent 8f72fd0fea
commit db4c2aa930
2 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Sources/Views/Cells/InfoCell.swift
View File

@@ -26,6 +26,7 @@ struct InfoCell: View {
.font(monospaced ? .system(.body, design: .monospaced) : .body) .font(monospaced ? .system(.body, design: .monospaced) : .body)
} }
} }
// if let subtext { // if let subtext {
// Text(subtext) // Text(subtext)
// .font(.caption) // .font(.caption)

48
hooks/pre-push
View File

@@ -3,9 +3,11 @@ set -euo pipefail
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
REMOTE_NAME="${1:-origin}" REMOTE_NAME="${1:-origin}"
QUIET_RELEASE="${QUIET_RELEASE:-1}"
RELEASE_LOG="${RELEASE_LOG:-$ROOT_DIR/build/release.log}"
if [[ -n "${SKIP_RELEASE:-}" ]]; then if [[ -n "${SKIP_RELEASE:-}" ]]; then
echo "⚙️ SKIP_RELEASE set — skipping automated release build." echo "release: skipped (SKIP_RELEASE=1)"
exit 0 exit 0
fi fi
@@ -34,29 +36,49 @@ if [[ "$should_release" != true ]]; then
exit 0 exit 0
fi fi
echo "🚀 Detected push to master — bumping version and building release..." if [[ "$QUIET_RELEASE" == "1" ]]; then
NEW_VERSION="$("$ROOT_DIR/scripts/bump_version.sh")" mkdir -p "$(dirname "$RELEASE_LOG")"
echo "🔢 marketing_version -> ${NEW_VERSION}" : >"$RELEASE_LOG"
"$ROOT_DIR/scripts/sync_version.sh" fi
run_logged() {
if [[ "$QUIET_RELEASE" == "1" ]]; then
"$@" >>"$RELEASE_LOG" 2>&1
else
"$@"
fi
}
if [[ "$QUIET_RELEASE" == "1" ]]; then
NEW_VERSION="$("$ROOT_DIR/scripts/bump_version.sh" 2>>"$RELEASE_LOG" | tee -a "$RELEASE_LOG")"
else
NEW_VERSION="$("$ROOT_DIR/scripts/bump_version.sh")"
fi
run_logged "$ROOT_DIR/scripts/sync_version.sh"
git -C "$ROOT_DIR" add "$ROOT_DIR/version.json" "$ROOT_DIR/iKeyMon.xcodeproj/project.pbxproj" git -C "$ROOT_DIR" add "$ROOT_DIR/version.json" "$ROOT_DIR/iKeyMon.xcodeproj/project.pbxproj"
"$ROOT_DIR/scripts/build_release.sh" echo "release: building v${NEW_VERSION}..."
if ! run_logged "$ROOT_DIR/scripts/build_release.sh"; then
echo "release: failed (log: $RELEASE_LOG)"
exit 1
fi
git -C "$ROOT_DIR" add "$ROOT_DIR/version.json" "$ROOT_DIR/iKeyMon.xcodeproj/project.pbxproj" "$ROOT_DIR/Sparkle/appcast.xml" git -C "$ROOT_DIR" add "$ROOT_DIR/version.json" "$ROOT_DIR/iKeyMon.xcodeproj/project.pbxproj" "$ROOT_DIR/Sparkle/appcast.xml"
if git -C "$ROOT_DIR" diff --cached --quiet; then if git -C "$ROOT_DIR" diff --cached --quiet; then
echo "⚠️ No release changes detected; skipping release commit." echo "release: no changes detected; skipping commit"
else else
git -C "$ROOT_DIR" commit -m "chore: release ${NEW_VERSION}" run_logged git -C "$ROOT_DIR" commit -m "chore: release ${NEW_VERSION}" || {
echo "📝 Committed release ${NEW_VERSION}." echo "release: commit failed (log: $RELEASE_LOG)"
exit 1
}
fi fi
echo "📤 Pushing release commit..." if SKIP_RELEASE=1 git -C "$ROOT_DIR" push --quiet "$REMOTE_NAME" "${release_local_ref:-refs/heads/master}:${release_remote_ref:-refs/heads/master}"; then
if SKIP_RELEASE=1 git -C "$ROOT_DIR" push "$REMOTE_NAME" "${release_local_ref:-refs/heads/master}:${release_remote_ref:-refs/heads/master}"; then echo "release: success v${NEW_VERSION}"
echo "✅ Release ${NEW_VERSION} pushed. Original push cancelled (already done)."
exit 1 exit 1
else else
echo "❌ Failed to push release ${NEW_VERSION}. Please resolve manually." echo "release: push failed (log: $RELEASE_LOG)"
exit 1 exit 1
fi fi