chore: release 26.1.6

- Simplified awk extraction without aggressive sed cleanup
- Now correctly extracts version-specific changelog entries
- Works with minimal or full changelog sections

.gitignore

@@ -5,3 +5,4 @@ build/
 Build/
 dist/
 .signing.env
+homebrew-tap/

CHANGELOG.md

@@ -1,22 +1,36 @@
 # Changelog
 
-## Unreleased
+## 26.1.6
+- Publish Gitea releases as stable by default instead of pre-releases.
+- Update the Homebrew tap automatically after each successful release by rewriting the cask version and DMG checksum, then pushing the tap repo.
+- Simplified the README for end users by adding clear install options and trimming internal release-engineering details.
+- Ignore the local `homebrew-tap/` checkout in the main app repository.
+
+## 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 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 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
 - Flattened the project structure so sources live at the repository root instead of the nested `iKeyMon/` folder and updated the Xcode project accordingly.

NOTES.md

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

README.md

@@ -11,7 +11,9 @@ iKeyMon is a native macOS app written in SwiftUI that provides live monitoring f
 - Automatic refreshes:
   - Ping every 10 seconds
   - Server info every 60 seconds
+- Preferences dialog
 - Built-in Sparkle updater (automatic checks, downloads, and relaunch once a signed release is available)
+- macOS notifications if servers or services become unavailable
 - Organized layout using tabs: General / Resources / Services
 - Stores API keys securely in the macOS Keychain
 - Native macOS look & feel using SwiftUI
@@ -24,11 +26,30 @@ iKeyMon is a native macOS app written in SwiftUI that provides live monitoring f
 
 ## 🛠️ Planned Features
 
-- Preferences dialog
+- iOS support is a possibility, but it is unclear if or when that will happen
-- macOS notifications if servers or services become unavailable
-- Optional iOS support if there is demand
 
-## 🚀 How to Run
+## 📦 Install
+
+### Option 1: Download the app
+
+Download the latest release from:
+
+https://git.24unix.net/tracer/iKeyMon/releases
+
+Then open the DMG and move `iKeyMon.app` to your `Applications` folder.
+
+### Option 2: Install with Homebrew
+
+```bash
+brew tap tracer/tap https://git.24unix.net/tracer/homebrew-tap.git
+brew install --cask ikeymon
+```
+
+### Option 3: Build it yourself
+
+Clone the repository, open it in Xcode, and run the app locally on macOS 14+.
+
+## 🚀 How to Build
 
 Clone the repo and open it in [Xcode](https://developer.apple.com/xcode/). You can build and run the app on macOS 14+.
                                      
@@ -38,79 +59,6 @@ cd iKeyMon
 open iKeyMon.xcodeproj
 ```
 
-### Local release build
-
-Use the helper script to produce distributables in `dist/`:
-
-```bash
-./scripts/build_release.sh
-```
-
-It cleans previous artifacts, builds the `Release` configuration, and drops both `iKeyMon-<version>.zip` and `iKeyMon-<version>.dmg` into the `dist` folder (ignored by git). To enable codesigning + notarization, copy `signing.env.example` to `.signing.env`, fill in your Developer ID identity, Apple ID, team ID, and app-specific password. The script sources that file locally (it remains gitignored) and performs signing/notarization when the values are present.
-
-To auto-publish the artifacts as a Gitea release, extend `.signing.env` with:
-
-```
-GITEA_TOKEN="..."
-GITEA_OWNER="tracer"
-GITEA_REPO="iKeyMon"
-# optional: GITEA_API_BASE="https://git.24unix.net/api/v1"
-# optional: GITEA_TARGET_COMMIT="master"
-# optional: GITEA_PRERELEASE="false"   # defaults to true until preferences are done
-# optional Sparkle feed helpers:
-# SPARKLE_EDDSA_KEY_FILE="$HOME/.config/Sparkle/iKeyMon.key"
-# SPARKLE_DOWNLOAD_BASE_TEMPLATE="https://git.24unix.net/tracer/iKeyMon/releases/download/v{{VERSION}}"
-# If you prefer SPARKLE_DOWNLOAD_BASE_URL, it will automatically append `/v<version>` for you.
-# SPARKLE_APPCAST_OUTPUT="$ROOT_DIR/Sparkle/appcast.xml"  # default
-```
-
-`GITEA_TARGET_COMMIT` defaults to the current `HEAD` commit, so overriding it lets you publish from another branch if needed. Whenever those variables are set, the script will create (or reuse) tag `v<version>` and upload both ZIP and DMG as release assets automatically.
-
-If you re-run the release script for the same version, it removes any existing assets with the same filenames before uploading, so you never end up with duplicate ZIP/DMG files on the release page.
-
-### Sparkle updates
-
-iKeyMon uses [Sparkle](https://sparkle-project.org/) for macOS-safe updates.
-
-1. Generate an EdDSA key pair once (`./Packages/Sparkle/bin/generate_keys`). Store the private key on-disk (for example `~/.config/Sparkle/iKeyMon.key`, which the build script expects) and copy the public key into the `SUPublicEDKey` entry (see Info.plist notes below).
-2. `./scripts/build_release.sh` signs the ZIP with Sparkle’s `sign_update` tool and invokes `generate_appcast` automatically when the Sparkle variables are present. The generated feed is written to `Sparkle/appcast.xml`, so commit that file after every release. Point `SPARKLE_DOWNLOAD_BASE_TEMPLATE` at your release-download prefix (e.g. `https://git.24unix.net/tracer/iKeyMon/releases/download/v{{VERSION}}`) so the generated URLs already match Gitea’s asset paths. The feed stays inside the repo (it is not uploaded as a release asset).
-3. Set `SUFeedURL` in Info.plist (or the corresponding build setting) to the raw URL of `Sparkle/appcast.xml` inside this repo (e.g. `https://git.24unix.net/tracer/iKeyMon/raw/branch/master/Sparkle/appcast.xml`).
-
-Preferences expose Sparkle’s built-in toggles for “Automatically check” and “Automatically download”, and the toolbar button simply calls Sparkle’s “Check for Updates…” sheet.
-
-> `./scripts/build_release.sh` will call `generate_appcast` for you when `SPARKLE_EDDSA_KEY_FILE` and `SPARKLE_DOWNLOAD_BASE_TEMPLATE` (or `SPARKLE_DOWNLOAD_BASE_URL`) are set. It tries to locate Sparkle’s CLI in DerivedData automatically, but you can override the path via `SPARKLE_GENERATE_APPCAST`. The resulting feed is written to `SPARKLE_APPCAST_OUTPUT` (defaults to `Sparkle/appcast.xml`).
-
-> Build settings include `INFOPLIST_KEY_SUFeedURL` and `INFOPLIST_KEY_SUPublicEDKey`. Make sure to fill both before shipping a build so Sparkle knows where to fetch updates and how to verify them.
-
-#### Debugging Sparkle updates
-
-Launch the shipped app via CLI with `SPARKLE_VERBOSE_LOGGING=1` to mirror Sparkle’s activity in stdout/stderr:
-
-```bash
-SPARKLE_VERBOSE_LOGGING=1 /Applications/iKeyMon.app/Contents/MacOS/iKeyMon
-```
-
-Sparkle’s installer helper runs in a separate `SUPipedBinary` process. If the installer fails, collect additional details with `log show --process SUPipedBinary --last 5m`.
-
-### Automated release push
-
-If you want `git push origin master` to build/sign/notarize/upload automatically, enable the provided pre-push hook:
-
-```bash
-git config core.hooksPath hooks
-```
-
-The hook (see `hooks/pre-push`) watches for pushes that include `refs/heads/master`, automatically bumps `marketing_version` (incrementing the last component), runs `scripts/build_release.sh`, stages `version.json`, `iKeyMon.xcodeproj/project.pbxproj`, and `Sparkle/appcast.xml`, then creates a commit `chore: release <version>`. It performs its own `git push` behind the scenes and cancels the original push command so you don't upload the same refs twice—once you see “Release … pushed. Original push cancelled”, you're done (Git will report the original push failed; that's expected). To skip the automation temporarily, prepend `SKIP_RELEASE=1` to your `git push` command.
-
-The bumping logic lives in `scripts/bump_version.sh` (feel free to run it manually if you need to create a release without pushing).
-
-### Versioning workflow
-
-- The canonical marketing version lives in `version.json` and follows the format `YY.major.minor` (example: `26.1.2`). Update that file manually whenever you cut a new release branch.
-- The build number is derived automatically from the git commit count on the current branch (you can override it by exporting `BUILD_NUMBER` before running the script if needed).
-- Run `./scripts/sync_version.sh` anytime after editing `version.json` (the release script already calls it). The helper updates `MARKETING_VERSION` and `CURRENT_PROJECT_VERSION` inside `iKeyMon.xcodeproj`, keeping Xcode, the app bundle, and release artifacts in sync.
-- `scripts/build_release.sh` reads the same `version.json` for naming the generated ZIP/DMG, so the artifact names, Info.plist values, and UI displays all stay aligned.
-
 ## 📦 License
 
 MIT — see [LICENSE](LICENSE) for details.

Sources/Views/PreferencesView.swift

@@ -23,6 +23,7 @@ struct PreferencesView: View {
         }
     }
     @EnvironmentObject private var sparkleUpdater: SparkleUpdater
+    @Environment(\.colorScheme) private var colorScheme
 
     @AppStorage("pingInterval") private var storedPingInterval: Int = 10
     @AppStorage("refreshInterval") private var storedRefreshInterval: Int = 60
@@ -143,12 +144,39 @@ struct PreferencesView: View {
     }
     private func backgroundColor(for tab: Tab) -> Color {
         if selection == tab {
-            return Color.accentColor
+            return sidebarSelectionColor
         }
         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)
     }
 }
 

Sources/Views/ServerDetailView.swift

@@ -11,6 +11,7 @@ struct ServerDetailView: View {
     @Binding var server: Server
     var isFetching: Bool
     @AppStorage("showIntervalIndicator") private var showIntervalIndicator: Bool = true
+    @AppStorage("refreshInterval") private var refreshInterval: Int = 60
 
     private var showPlaceholder: Bool {
         server.info == nil
@@ -59,7 +60,7 @@ struct ServerDetailView: View {
         .onReceive(timer) { _ in
             guard showIntervalIndicator else { return }
             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 }
             }
         }

Sources/Views/Tabs/ResourcesView.swift

@@ -17,6 +17,10 @@ import SwiftUI
 struct ResourcesView: View {
     @Binding var server: Server
 
+    private var displayInfo: ServerInfo {
+        server.info ?? .placeholder
+    }
+
     var body: some View {
         GeometryReader { geometry in
             ScrollView {
@@ -25,40 +29,40 @@ struct ResourcesView: View {
                         Text("CPU Load")
                     } value: {
                         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 {
                         Text("Memory")
                     } value: {
                         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 {
                         Text("Swap")
                     } value: {
                         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 {
                         Text("SSD")
                     } value: {
                         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
                         )
                     }
                 }

Sparkle/appcast.xml

@@ -3,28 +3,28 @@
     <channel>
         <title>iKeyMon</title>
         <item>
-            <title>26.0.70</title>
+            <title>26.1.6</title>
-            <pubDate>Sat, 03 Jan 2026 15:49:42 +0100</pubDate>
+            <pubDate>Sun, 19 Apr 2026 15:26:19 +0200</pubDate>
-            <sparkle:version>154</sparkle:version>
+            <sparkle:version>175</sparkle:version>
-            <sparkle:shortVersionString>26.0.70</sparkle:shortVersionString>
+            <sparkle:shortVersionString>26.1.6</sparkle:shortVersionString>
             <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.6/iKeyMon-26.1.6.zip" length="3063130" type="application/octet-stream" sparkle:edSignature="QPy3zm31ZTXE9grlj7Ul6kEG2t0veODEBjJ/qADM8A88lLJ8V9L4WhNnD8wmM7Urh1O6eZKl1qrCLTk0oo3WBA=="/>
         </item>
         <item>
-            <title>26.0.69</title>
+            <title>26.1.5</title>
-            <pubDate>Sat, 03 Jan 2026 14:00:40 +0100</pubDate>
+            <pubDate>Sun, 19 Apr 2026 12:09:33 +0200</pubDate>
-            <sparkle:version>150</sparkle:version>
+            <sparkle:version>173</sparkle:version>
-            <sparkle:shortVersionString>26.0.69</sparkle:shortVersionString>
+            <sparkle:shortVersionString>26.1.5</sparkle:shortVersionString>
             <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.5/iKeyMon-26.1.5.zip" length="3065231" type="application/octet-stream" sparkle:edSignature="HVV7iZ4eyJC1VMh2q4GUoAESZnk4HoFU00QlA9qM4X4dJAT5oBEVB55m4wuF4u9iVFAeohkB0vleLlV39mxrBA=="/>
         </item>
         <item>
-            <title>26.0.68</title>
+            <title>26.1.3</title>
-            <pubDate>Sat, 03 Jan 2026 13:52:33 +0100</pubDate>
+            <pubDate>Sun, 19 Apr 2026 11:53:25 +0200</pubDate>
-            <sparkle:version>148</sparkle:version>
+            <sparkle:version>170</sparkle:version>
-            <sparkle:shortVersionString>26.0.68</sparkle:shortVersionString>
+            <sparkle:shortVersionString>26.1.4</sparkle:shortVersionString>
             <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.4/iKeyMon-26.1.4.zip" length="3065263" type="application/octet-stream" sparkle:edSignature="kDxHy5KsxeCYz3N4aIEiZAFnqz6lLg4dHCLG6FL+j37xEpFmZM0lfHL2A15Jg936GeE+iGf6WrQJFInhHAvGDg=="/>
         </item>
     </channel>
 </rss>

hooks/pre-push

@@ -4,13 +4,19 @@ set -euo pipefail
 ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 REMOTE_NAME="${1:-origin}"
 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
   echo "release: skipped (SKIP_RELEASE=1)"
   exit 0
 fi
 
+head_subject="$(git -C "$ROOT_DIR" log -1 --pretty=%s 2>/dev/null || true)"
+if [[ "$head_subject" =~ ^chore:\ release\  ]]; then
+  echo "release: skipped (HEAD is already a release commit)"
+  exit 0
+fi
+
 should_release=false
 release_local_ref=""
 release_remote_ref=""
@@ -67,7 +73,8 @@ fi
 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
-  echo "release: no changes detected; skipping commit"
+  echo "release: no changes detected; continuing push"
+  exit 0
 else
   run_logged git -C "$ROOT_DIR" commit -m "chore: release ${NEW_VERSION}" || {
     echo "release: commit failed (log: $RELEASE_LOG)"
@@ -75,10 +82,5 @@ else
   }
 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
+echo "release: created commit for v${NEW_VERSION}; run 'git push' again to push the new release commit"
-  echo "release: success v${NEW_VERSION}"
+exit 1
-  exit 1
-else
-  echo "release: push failed (log: $RELEASE_LOG)"
-  exit 1
-fi

iKeyMon.xcodeproj/project.pbxproj

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

scripts/build_release.sh

@@ -3,6 +3,7 @@ set -euo pipefail
 
 ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 BUILD_DIR="$ROOT_DIR/build"
+DERIVED_DATA_DIR="$BUILD_DIR/derived-data"
 ARTIFACTS_DIR="$ROOT_DIR/dist"
 SCHEME="iKeyMon"
 PROJECT="iKeyMon.xcodeproj"
@@ -141,18 +142,18 @@ export SPARKLE_APPCAST_OUTPUT
 
 "$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 \
   -project "$ROOT_DIR/$PROJECT" \
   -scheme "$SCHEME" \
   -configuration Release \
-  -derivedDataPath "$BUILD_DIR" \
+  -derivedDataPath "$DERIVED_DATA_DIR" \
   CODE_SIGNING_ALLOWED=NO \
   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
   echo "❌ Failed to find built app at $APP_PATH"
   exit 1
@@ -215,8 +216,10 @@ generate_appcast
 
 if [[ -n "${GITEA_TOKEN:-}" && -n "${GITEA_OWNER:-}" && -n "${GITEA_REPO:-}" ]]; then
   "$ROOT_DIR/scripts/publish_release.sh" "$VERSION" "$ARTIFACTS_DIR/$ZIP_NAME" "$ARTIFACTS_DIR/$DMG_NAME"
+  "$ROOT_DIR/scripts/update_homebrew_tap.sh" "$VERSION" "$ARTIFACTS_DIR/$DMG_NAME"
 else
   echo "ℹ️ Skipping Gitea release publishing (GITEA_* variables not fully set)."
+  echo "ℹ️ Skipping Homebrew tap update because release publishing was skipped."
 fi
 
 echo "✅ Build complete. Artifacts:"

scripts/publish_release.sh

@@ -15,20 +15,49 @@ API_BASE="${GITEA_API_BASE:-https://git.24unix.net/api/v1}"
 API_BASE="${API_BASE%/}"
 RELEASE_TAG="v${VERSION}"
 API_URL="${API_BASE}/repos/${GITEA_OWNER}/${GITEA_REPO}"
+CHANGELOG_FILE="$ROOT_DIR/CHANGELOG.md"
 
 if ! command -v jq >/dev/null 2>&1; then
   echo "❌ jq is required to parse Gitea responses." >&2
   exit 1
 fi
 
-PRERELEASE_FLAG="${GITEA_PRERELEASE:-true}"
+# 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:-false}"
 
 create_payload="$(jq -n \
   --arg tag "$RELEASE_TAG" \
   --arg name "iKeyMon ${VERSION}" \
   --arg target "$TARGET_COMMIT" \
+  --arg body "$CHANGELOG_BODY" \
   --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)"
 http_code=$(curl -sS -w "%{http_code}" -o "$response_file" \

scripts/update_homebrew_tap.sh

@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+VERSION="${1:?usage: update_homebrew_tap.sh <version> <dmg_path>}"
+DMG_PATH="${2:?usage: update_homebrew_tap.sh <version> <dmg_path>}"
+TAP_DIR="${HOMEBREW_TAP_DIR:-$ROOT_DIR/homebrew-tap}"
+CASK_FILE="$TAP_DIR/Casks/ikeymon.rb"
+
+if [[ ! -d "$TAP_DIR/.git" ]]; then
+  echo "❌ Homebrew tap repo not found at $TAP_DIR"
+  exit 1
+fi
+
+if [[ ! -f "$CASK_FILE" ]]; then
+  echo "❌ Homebrew cask file not found at $CASK_FILE"
+  exit 1
+fi
+
+if [[ ! -f "$DMG_PATH" ]]; then
+  echo "❌ DMG artifact not found at $DMG_PATH"
+  exit 1
+fi
+
+if [[ -n "$(git -C "$TAP_DIR" status --porcelain)" ]]; then
+  echo "❌ Homebrew tap repo has uncommitted changes: $TAP_DIR"
+  exit 1
+fi
+
+SHA256="$(shasum -a 256 "$DMG_PATH" | awk '{print $1}')"
+
+python3 - <<'PY' "$CASK_FILE" "$VERSION" "$SHA256"
+from pathlib import Path
+import re
+import sys
+
+cask_path = Path(sys.argv[1])
+version = sys.argv[2]
+sha256 = sys.argv[3]
+content = cask_path.read_text(encoding="utf-8")
+
+content, version_count = re.subn(r'version "[^"]+"', f'version "{version}"', content, count=1)
+content, sha_count = re.subn(r'sha256 "[^"]+"', f'sha256 "{sha256}"', content, count=1)
+
+if version_count != 1 or sha_count != 1:
+    raise SystemExit("Failed to update version or sha256 in cask file")
+
+cask_path.write_text(content, encoding="utf-8")
+PY
+
+ruby -c "$CASK_FILE" >/dev/null
+
+if git -C "$TAP_DIR" diff --quiet -- "$CASK_FILE"; then
+  echo "ℹ️ Homebrew tap already points to iKeyMon ${VERSION}"
+  exit 0
+fi
+
+git -C "$TAP_DIR" add "$CASK_FILE"
+git -C "$TAP_DIR" commit -m "cask: update ikeymon to ${VERSION}"
+git -C "$TAP_DIR" push origin master
+
+echo "✅ Updated Homebrew tap to iKeyMon ${VERSION}"

version.json

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