16 Commits

Author SHA1 Message Date
9f42c68279 chore: release 26.1.4 2026-04-19 11:59:17 +02:00
031781761c fix: preserve release logs during pre-push release 2026-04-19 11:46:11 +02:00
9413c23cc5 fixed color crash 2026-04-19 11:33:15 +02:00
Micha
c8d3289a9b chore: release 26.1.3 2026-01-03 18:17:27 +01:00
Micha
c063add947 docs: add 26.1.3 changelog entry 2026-01-03 18:14:32 +01:00
Micha
610c569b83 docs: add 26.1.2 changelog entry 2026-01-03 18:09:50 +01:00
Micha
7d7a79cf13 chore: release 26.1.2 2026-01-03 18:05:28 +01:00
Micha
2775e44f92 docs: add 26.1.1 changelog entry 2026-01-03 18:02:34 +01:00
Micha
d5cadf75ca chore: release 26.1.1 2026-01-03 16:34:23 +01:00
Micha
28104c1bc3 fix: improve changelog extraction in publish script
- Simplified awk extraction without aggressive sed cleanup
- Now correctly extracts version-specific changelog entries
- Works with minimal or full changelog sections
2026-01-03 16:32:12 +01:00
Micha
8dae638111 docs: rename 'Unreleased' to 'Prereleases' in changelog 2026-01-03 16:29:33 +01:00
Micha
670c8fe83b docs: reorganize changelog - move auto-populate to 26.1.0, update section order 2026-01-03 16:27:58 +01:00
Micha
846983649a docs: update changelog for 26.1.0 release 2026-01-03 16:25:42 +01:00
Micha
1670b030ba feat: auto-populate release description from CHANGELOG
- Extract changelog entry for current version when creating releases
- Parse CHANGELOG.md and add to release body in Gitea
- Falls back to 'See commit history for details.' if no changelog found
- Keeps release notes synchronized with version
2026-01-03 16:23:24 +01:00
Micha
fc43fa9094 chore: release 26.1.0 2026-01-03 16:21:16 +01:00
Micha
4f026d6e1b fix: interval indicator respects refresh interval setting
- ServerDetailView now reads refreshInterval from AppStorage
- Progress bar duration dynamically adjusts based on user's refresh interval setting
- Previously hardcoded to 60 seconds regardless of user preference
2026-01-03 16:18:08 +01:00
11 changed files with 134 additions and 64 deletions

View File

@@ -1,22 +1,31 @@
# Changelog # Changelog
## Unreleased
## 26.1.3
- Fixed version handling for changelogs.
## 26.1.2 (2025-01-03)
- Synced version.json to 26.1.2.
## 26.1.1 (2025-01-03)
- Fixed changelog extraction in publish script.
## 26.1.0 (2025-01-03)
- Auto-populate release description from CHANGELOG when publishing to Gitea.
## Prereleases
### Fixed ### Fixed
- Fixed Sparkle updater ZIP archive creation: replaced `zip` command with `ditto` to properly preserve app bundle code signatures during extraction, resolving "damaged app" errors on update installation. - Fixed excessive refresh timer resets by properly cancelling previous subscriptions and validating value changes before recreating timers.
- Fixed code signature issues for sandboxed apps by removing entitlements parameter from non-sandboxed builds. - Fixed interval indicator to respect user's refresh interval setting instead of always assuming 60 seconds.
- Fixed Sparkle framework deep code signing to handle complex framework structure.
- Fixed missing XPC service entitlements (`com.apple.security.xpc.aConnectionServices`, `com.apple.security.xpc.aStatusServices`) required for Sparkle installer to communicate with sandboxed app.
### Changed
- Re-enabled app sandbox with minimal entitlements (network.client only) for improved security while maintaining Sparkle update functionality.
- Enhanced Sparkle error logging to include error domain and code information, making update failures easier to diagnose.
- Updated build script to use `ditto -c -k --keepParent` for creating update ZIPs, which properly preserves code signatures that `zip` command breaks.
### Added ### Added
- Added in-app Sparkle update logs in Preferences → Updates tab with Show/Hide toggle for real-time debugging of update operations. - Added status notifications for server monitoring in Preferences → Notifications:
- Log entries include timestamps and distinguish between info and error messages. - "Status Notifications" toggle: alerts when servers go offline/online or services change status.
- Users can clear logs manually and logs persist during the session (max 100 entries). - "Alert Notifications" toggle: (placeholder for future alert threshold configuration).
- Ping status changes now trigger notifications (Server Online/Offline).
- Service status monitoring tracks individual services (DNS, FTP, SSH, HTTP, HTTPS, etc.) and alerts when they go offline or come back online.
- Notification permissions are requested automatically when the app launches.
### Previous Changes ### Previous Changes
- Flattened the project structure so sources live at the repository root instead of the nested `iKeyMon/` folder and updated the Xcode project accordingly. - Flattened the project structure so sources live at the repository root instead of the nested `iKeyMon/` folder and updated the Xcode project accordingly.

View File

@@ -5,5 +5,3 @@
add a marker for "reboot required" add a marker for "reboot required"
1112

View File

@@ -23,6 +23,7 @@ struct PreferencesView: View {
} }
} }
@EnvironmentObject private var sparkleUpdater: SparkleUpdater @EnvironmentObject private var sparkleUpdater: SparkleUpdater
@Environment(\.colorScheme) private var colorScheme
@AppStorage("pingInterval") private var storedPingInterval: Int = 10 @AppStorage("pingInterval") private var storedPingInterval: Int = 10
@AppStorage("refreshInterval") private var storedRefreshInterval: Int = 60 @AppStorage("refreshInterval") private var storedRefreshInterval: Int = 60
@@ -143,12 +144,39 @@ struct PreferencesView: View {
} }
private func backgroundColor(for tab: Tab) -> Color { private func backgroundColor(for tab: Tab) -> Color {
if selection == tab { if selection == tab {
return Color.accentColor return sidebarSelectionColor
} }
if hoveredTab == tab { if hoveredTab == tab {
return Color.accentColor.opacity(0.2) return sidebarHoverColor
}
return sidebarBaseColor
}
private var sidebarSelectionColor: Color {
switch colorScheme {
case .dark:
return Color(red: 0.22, green: 0.45, blue: 0.88)
default:
return Color(red: 0.10, green: 0.39, blue: 0.90)
}
}
private var sidebarHoverColor: Color {
switch colorScheme {
case .dark:
return Color(red: 0.20, green: 0.22, blue: 0.27)
default:
return Color(red: 0.87, green: 0.91, blue: 0.98)
}
}
private var sidebarBaseColor: Color {
switch colorScheme {
case .dark:
return Color(red: 0.15, green: 0.16, blue: 0.19)
default:
return Color(red: 0.96, green: 0.97, blue: 0.99)
} }
return Color.accentColor.opacity(0.08)
} }
} }

View File

@@ -11,6 +11,7 @@ struct ServerDetailView: View {
@Binding var server: Server @Binding var server: Server
var isFetching: Bool var isFetching: Bool
@AppStorage("showIntervalIndicator") private var showIntervalIndicator: Bool = true @AppStorage("showIntervalIndicator") private var showIntervalIndicator: Bool = true
@AppStorage("refreshInterval") private var refreshInterval: Int = 60
private var showPlaceholder: Bool { private var showPlaceholder: Bool {
server.info == nil server.info == nil
@@ -59,7 +60,7 @@ struct ServerDetailView: View {
.onReceive(timer) { _ in .onReceive(timer) { _ in
guard showIntervalIndicator else { return } guard showIntervalIndicator else { return }
withAnimation(.linear(duration: 1.0 / 60.0)) { withAnimation(.linear(duration: 1.0 / 60.0)) {
progress += 1.0 / (60.0 * 60.0) progress += 1.0 / (Double(refreshInterval) * 60.0)
if progress >= 1 { progress = 0 } if progress >= 1 { progress = 0 }
} }
} }

View File

@@ -17,6 +17,10 @@ import SwiftUI
struct ResourcesView: View { struct ResourcesView: View {
@Binding var server: Server @Binding var server: Server
private var displayInfo: ServerInfo {
server.info ?? .placeholder
}
var body: some View { var body: some View {
GeometryReader { geometry in GeometryReader { geometry in
ScrollView { ScrollView {
@@ -25,40 +29,40 @@ struct ResourcesView: View {
Text("CPU Load") Text("CPU Load")
} value: { } value: {
LoadBarCell( LoadBarCell(
percent: (server.info?.load.percent)!, percent: displayInfo.load.percent,
load1: (server.info?.load.minute1)!, load1: displayInfo.load.minute1,
load5: (server.info?.load.minute5)!, load5: displayInfo.load.minute5,
load15: (server.info?.load.minute15)! load15: displayInfo.load.minute15
) )
} }
TableRowView { TableRowView {
Text("Memory") Text("Memory")
} value: { } value: {
UsageBarCell( UsageBarCell(
free: (server.info?.memory.free)!, free: displayInfo.memory.free,
used: (server.info?.memory.used)!, used: displayInfo.memory.used,
total: (server.info?.memory.total)!, total: displayInfo.memory.total,
percent: (server.info?.memory.percent)! percent: displayInfo.memory.percent
) )
} }
TableRowView { TableRowView {
Text("Swap") Text("Swap")
} value: { } value: {
UsageBarCell( UsageBarCell(
free: (server.info?.swap.free)!, free: displayInfo.swap.free,
used: (server.info?.swap.used)!, used: displayInfo.swap.used,
total: (server.info?.swap.total)!, total: displayInfo.swap.total,
percent: (server.info?.swap.percent)! percent: displayInfo.swap.percent
) )
} }
TableRowView { TableRowView {
Text("SSD") Text("SSD")
} value: { } value: {
UsageBarCell( UsageBarCell(
free: (server.info?.diskSpace.free)!, free: displayInfo.diskSpace.free,
used: (server.info?.diskSpace.used)!, used: displayInfo.diskSpace.used,
total: (server.info?.diskSpace.total)!, total: displayInfo.diskSpace.total,
percent: (server.info?.diskSpace.percent)! percent: displayInfo.diskSpace.percent
) )
} }
} }

30
Sparkle/appcast.xml vendored
View File

@@ -3,28 +3,28 @@
<channel> <channel>
<title>iKeyMon</title> <title>iKeyMon</title>
<item> <item>
<title>26.0.70</title> <title>26.1.3</title>
<pubDate>Sat, 03 Jan 2026 15:49:42 +0100</pubDate> <pubDate>Sun, 19 Apr 2026 11:53:25 +0200</pubDate>
<sparkle:version>154</sparkle:version> <sparkle:version>170</sparkle:version>
<sparkle:shortVersionString>26.0.70</sparkle:shortVersionString> <sparkle:shortVersionString>26.1.4</sparkle:shortVersionString>
<sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion> <sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion>
<enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.0.70/iKeyMon-26.0.70.zip" length="3007098" type="application/octet-stream" sparkle:edSignature="XZA2xs40EZnexsv/DvzjiH2yiQACqlU+KSDFGqFQTgCTFEPxg6w/qx1cuolgHD3kQJm/svRTNYRR4OVYt9UQBA=="/> <enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.1.4/iKeyMon-26.1.4.zip" length="3065263" type="application/octet-stream" sparkle:edSignature="kDxHy5KsxeCYz3N4aIEiZAFnqz6lLg4dHCLG6FL+j37xEpFmZM0lfHL2A15Jg936GeE+iGf6WrQJFInhHAvGDg=="/>
</item> </item>
<item> <item>
<title>26.0.69</title> <title>26.1.3</title>
<pubDate>Sat, 03 Jan 2026 14:00:40 +0100</pubDate> <pubDate>Sat, 03 Jan 2026 18:17:26 +0100</pubDate>
<sparkle:version>150</sparkle:version> <sparkle:version>167</sparkle:version>
<sparkle:shortVersionString>26.0.69</sparkle:shortVersionString> <sparkle:shortVersionString>26.1.3</sparkle:shortVersionString>
<sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion> <sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion>
<enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.0.69/iKeyMon-26.0.69.zip" length="2993457" type="application/octet-stream" sparkle:edSignature="cIqWamcPRsxA7zPaGcUuUOqLYs5KTcoAgXQkhblCF+Wc2tEnGHFVysARtMH68jGq7ObfhDuI3oZJNg857rQ0Dg=="/> <enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.1.3/iKeyMon-26.1.3.zip" length="3007204" type="application/octet-stream" sparkle:edSignature="u8a/cDZFPV0a21y+1q7HpZjQQv8r7GtlrHqyinDtgI6jI5Sv5q26x0sTagPrmrwwydIj3hWFmHN/iYp/PomaCw=="/>
</item> </item>
<item> <item>
<title>26.0.68</title> <title>26.1.2</title>
<pubDate>Sat, 03 Jan 2026 13:52:33 +0100</pubDate> <pubDate>Sat, 03 Jan 2026 18:05:27 +0100</pubDate>
<sparkle:version>148</sparkle:version> <sparkle:version>164</sparkle:version>
<sparkle:shortVersionString>26.0.68</sparkle:shortVersionString> <sparkle:shortVersionString>26.1.2</sparkle:shortVersionString>
<sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion> <sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion>
<enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.0.68/iKeyMon-26.0.68.zip" length="2993469" type="application/octet-stream" sparkle:edSignature="M5WBkO4BN8RwMJ0ZU3Ku4CyQllnbEzz9X6MYR4IVX5prO9oyMBGoceHA3C97wZA6+++9u7RnRsKrFvei2CsWBQ=="/> <enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.1.2/iKeyMon-26.1.2.zip" length="3007173" type="application/octet-stream" sparkle:edSignature="CiNeGZ9h4WtI/ZOW371EAEKGK0vWdu1VhBk5ewh2hoq+4C8R9DbnQvDyHvwFy4wh6VpLahp/mXr4gV5alEIRCw=="/>
</item> </item>
</channel> </channel>
</rss> </rss>

View File

@@ -4,7 +4,7 @@ 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}" QUIET_RELEASE="${QUIET_RELEASE:-1}"
RELEASE_LOG="${RELEASE_LOG:-$ROOT_DIR/build/release.log}" RELEASE_LOG="${RELEASE_LOG:-$ROOT_DIR/.git/release.log}"
if [[ -n "${SKIP_RELEASE:-}" ]]; then if [[ -n "${SKIP_RELEASE:-}" ]]; then
echo "release: skipped (SKIP_RELEASE=1)" echo "release: skipped (SKIP_RELEASE=1)"
@@ -76,7 +76,7 @@ else
fi fi
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 --quiet "$REMOTE_NAME" "${release_local_ref:-refs/heads/master}:${release_remote_ref:-refs/heads/master}"; then
echo "release: success v${NEW_VERSION}" echo "release: success v${NEW_VERSION} (release commit already pushed; stopping original push)"
exit 1 exit 1
else else
echo "release: push failed (log: $RELEASE_LOG)" echo "release: push failed (log: $RELEASE_LOG)"

View File

@@ -322,7 +322,7 @@
CODE_SIGN_ENTITLEMENTS = iKeyMon.entitlements; CODE_SIGN_ENTITLEMENTS = iKeyMon.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 154; CURRENT_PROJECT_VERSION = 170;
DEVELOPMENT_ASSET_PATHS = "\"Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"Preview Content\"";
DEVELOPMENT_TEAM = Q5486ZVAFT; DEVELOPMENT_TEAM = Q5486ZVAFT;
ENABLE_HARDENED_RUNTIME = YES; ENABLE_HARDENED_RUNTIME = YES;
@@ -337,7 +337,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/../Frameworks", "@executable_path/../Frameworks",
); );
MARKETING_VERSION = 26.0.70; MARKETING_VERSION = 26.1.4;
PRODUCT_BUNDLE_IDENTIFIER = net.24unix.iKeyMon; PRODUCT_BUNDLE_IDENTIFIER = net.24unix.iKeyMon;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;
@@ -353,7 +353,7 @@
CODE_SIGN_ENTITLEMENTS = iKeyMon.entitlements; CODE_SIGN_ENTITLEMENTS = iKeyMon.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 154; CURRENT_PROJECT_VERSION = 170;
DEVELOPMENT_ASSET_PATHS = "\"Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"Preview Content\"";
DEVELOPMENT_TEAM = Q5486ZVAFT; DEVELOPMENT_TEAM = Q5486ZVAFT;
ENABLE_HARDENED_RUNTIME = YES; ENABLE_HARDENED_RUNTIME = YES;
@@ -368,7 +368,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/../Frameworks", "@executable_path/../Frameworks",
); );
MARKETING_VERSION = 26.0.70; MARKETING_VERSION = 26.1.4;
PRODUCT_BUNDLE_IDENTIFIER = net.24unix.iKeyMon; PRODUCT_BUNDLE_IDENTIFIER = net.24unix.iKeyMon;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;

View File

@@ -3,6 +3,7 @@ set -euo pipefail
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
BUILD_DIR="$ROOT_DIR/build" BUILD_DIR="$ROOT_DIR/build"
DERIVED_DATA_DIR="$BUILD_DIR/derived-data"
ARTIFACTS_DIR="$ROOT_DIR/dist" ARTIFACTS_DIR="$ROOT_DIR/dist"
SCHEME="iKeyMon" SCHEME="iKeyMon"
PROJECT="iKeyMon.xcodeproj" PROJECT="iKeyMon.xcodeproj"
@@ -141,18 +142,18 @@ export SPARKLE_APPCAST_OUTPUT
"$ROOT_DIR/scripts/sync_version.sh" "$ROOT_DIR/scripts/sync_version.sh"
rm -rf "$BUILD_DIR" "$ARTIFACTS_DIR" rm -rf "$DERIVED_DATA_DIR" "$ARTIFACTS_DIR"
mkdir -p "$ARTIFACTS_DIR" mkdir -p "$BUILD_DIR" "$ARTIFACTS_DIR"
xcodebuild \ xcodebuild \
-project "$ROOT_DIR/$PROJECT" \ -project "$ROOT_DIR/$PROJECT" \
-scheme "$SCHEME" \ -scheme "$SCHEME" \
-configuration Release \ -configuration Release \
-derivedDataPath "$BUILD_DIR" \ -derivedDataPath "$DERIVED_DATA_DIR" \
CODE_SIGNING_ALLOWED=NO \ CODE_SIGNING_ALLOWED=NO \
clean build clean build
APP_PATH="$BUILD_DIR/Build/Products/Release/iKeyMon.app" APP_PATH="$DERIVED_DATA_DIR/Build/Products/Release/iKeyMon.app"
if [[ ! -d "$APP_PATH" ]]; then if [[ ! -d "$APP_PATH" ]]; then
echo "❌ Failed to find built app at $APP_PATH" echo "❌ Failed to find built app at $APP_PATH"
exit 1 exit 1

View File

@@ -15,20 +15,49 @@ API_BASE="${GITEA_API_BASE:-https://git.24unix.net/api/v1}"
API_BASE="${API_BASE%/}" API_BASE="${API_BASE%/}"
RELEASE_TAG="v${VERSION}" RELEASE_TAG="v${VERSION}"
API_URL="${API_BASE}/repos/${GITEA_OWNER}/${GITEA_REPO}" API_URL="${API_BASE}/repos/${GITEA_OWNER}/${GITEA_REPO}"
CHANGELOG_FILE="$ROOT_DIR/CHANGELOG.md"
if ! command -v jq >/dev/null 2>&1; then if ! command -v jq >/dev/null 2>&1; then
echo "❌ jq is required to parse Gitea responses." >&2 echo "❌ jq is required to parse Gitea responses." >&2
exit 1 exit 1
fi fi
# Extract changelog for this version
extract_changelog() {
local version="$1"
local changelog_file="$2"
if [[ ! -f "$changelog_file" ]]; then
echo ""
return
fi
awk -v ver="## $version" '
/^## / {
if (found) exit
if ($0 ~ ver) {
found=1
next
}
}
found { print }
' "$changelog_file"
}
CHANGELOG_BODY="$(extract_changelog "$VERSION" "$CHANGELOG_FILE")"
if [[ -z "$CHANGELOG_BODY" ]]; then
CHANGELOG_BODY="See commit history for details."
fi
PRERELEASE_FLAG="${GITEA_PRERELEASE:-true}" PRERELEASE_FLAG="${GITEA_PRERELEASE:-true}"
create_payload="$(jq -n \ create_payload="$(jq -n \
--arg tag "$RELEASE_TAG" \ --arg tag "$RELEASE_TAG" \
--arg name "iKeyMon ${VERSION}" \ --arg name "iKeyMon ${VERSION}" \
--arg target "$TARGET_COMMIT" \ --arg target "$TARGET_COMMIT" \
--arg body "$CHANGELOG_BODY" \
--argjson prerelease "$PRERELEASE_FLAG" \ --argjson prerelease "$PRERELEASE_FLAG" \
'{ tag_name: $tag, name: $name, target_commitish: $target, draft: false, prerelease: $prerelease }')" '{ tag_name: $tag, name: $name, target_commitish: $target, body: $body, draft: false, prerelease: $prerelease }')"
response_file="$(mktemp)" response_file="$(mktemp)"
http_code=$(curl -sS -w "%{http_code}" -o "$response_file" \ http_code=$(curl -sS -w "%{http_code}" -o "$response_file" \

View File

@@ -1,3 +1,3 @@
{ {
"marketing_version": "26.0.70" "marketing_version": "26.1.4"
} }