Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
24794a1d63 | ||
|
|
d65ec99cfb | ||
|
|
57dc68f434 | ||
|
|
e3b14e87fe | ||
|
|
1c7e14a9db | ||
|
|
fc3e55294a | ||
|
|
02828c8d5b | ||
|
|
3f849d0db6 | ||
|
|
69904c07ce | ||
|
|
01c89de738 |
@@ -9,5 +9,6 @@
|
||||
- Detection now probes `meta.api_version` so future API versions are selected automatically, and the ping loop logs only failures to keep output quiet.
|
||||
- Introduced repository-wide version management via `version.json` + `scripts/sync_version.sh`, ensuring Xcode targets and release artifacts stay aligned.
|
||||
- Enhanced `scripts/build_release.sh` to timestamp/harden signatures, notarize DMGs, and optionally publish tagged releases (pre-release by default) with ZIP/DMG assets directly to Gitea when credentials are configured.
|
||||
- Added a lightweight update checker that polls the latest Gitea release, surfaces alerts + download shortcuts, and exposes new toggles (auto-check + prerelease channel) inside Preferences.
|
||||
- Integrated Sparkle (via Swift Package Manager) to handle automatic update checks, downloads, signature verification, and relaunches, replacing the previous custom updater UI. Preferences now simply surface Sparkle's check/download toggles.
|
||||
- `scripts/build_release.sh` can optionally run Sparkle’s `generate_appcast` (when signing key and download prefix env vars are set), producing a ready-to-host `appcast.xml` alongside the ZIP/DMG artifacts.
|
||||
- Further reduced MainView console noise by removing redundant refresh/onAppear logs.
|
||||
|
||||
7
NOTES.md
7
NOTES.md
@@ -3,6 +3,7 @@
|
||||
dynamic Data
|
||||
static Data
|
||||
|
||||
add a merker for "reboot required"
|
||||
Add dmg download option for macOS
|
||||
Add versioning
|
||||
add a marker for "reboot required"
|
||||
|
||||
dummy
|
||||
|
||||
|
||||
40
README.md
40
README.md
@@ -8,10 +8,10 @@ iKeyMon is a native macOS app written in SwiftUI that provides live monitoring f
|
||||
- Shows CPU load, memory usage, swap usage, and disk usage
|
||||
- Periodic ping via `/api/ping` endpoint to check if a server is reachable
|
||||
- Colored status indicator for each server in the list
|
||||
- Automatic updates:
|
||||
- Automatic refreshes:
|
||||
- Ping every 10 seconds
|
||||
- Server info every 60 seconds
|
||||
- Optional automatic update checks that watch the latest Gitea release (with manual “Check now” button and prerelease channel toggle)
|
||||
- Built-in Sparkle updater (automatic checks, downloads, and relaunch once a signed release is available)
|
||||
- Organized layout using tabs: General / Resources / Services
|
||||
- Stores API keys securely in the macOS Keychain
|
||||
- Native macOS look & feel using SwiftUI
|
||||
@@ -57,16 +57,42 @@ 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_URL="https://git.24unix.net/tracer/iKeyMon/releases/download"
|
||||
# SPARKLE_DOWNLOAD_SUBDIR_TEMPLATE="v{{VERSION}}"
|
||||
# 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.
|
||||
|
||||
### Update checks
|
||||
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.
|
||||
|
||||
- The app can automatically query the Gitea release feed on launch (Preferences → Updates → “Automatically check for updates”).
|
||||
- “Check for updates” also lives in the main window toolbar; if you're already up to date, you'll get a confirmation alert.
|
||||
- Preferences let you opt into prerelease builds (enabled by default for now because current releases are flagged prerelease) and show the latest fetched release number for reference.
|
||||
- When a newer build is available, a prompt offers to open the DMG download (or you can revisit the release info inside Preferences).
|
||||
### 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. Set `SPARKLE_DOWNLOAD_BASE_URL` to the static portion of your release-download endpoint (e.g. `https://…/releases/download`) and `SPARKLE_DOWNLOAD_SUBDIR_TEMPLATE` to the path segment that should be inserted before each asset (default `v{{VERSION}}` mirrors how Gitea exposes assets). 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`, `SPARKLE_DOWNLOAD_BASE_URL`, and (optionally) `SPARKLE_DOWNLOAD_SUBDIR_TEMPLATE` 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.
|
||||
|
||||
### 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
|
||||
|
||||
|
||||
@@ -1,160 +0,0 @@
|
||||
import Foundation
|
||||
|
||||
struct ReleaseInfo: Identifiable {
|
||||
let id = UUID()
|
||||
let version: VersionNumber
|
||||
let versionString: String
|
||||
let notes: String
|
||||
let downloadURL: URL
|
||||
let releaseURL: URL
|
||||
let prerelease: Bool
|
||||
}
|
||||
|
||||
struct VersionNumber: Comparable, CustomStringConvertible {
|
||||
let rawValue: String
|
||||
private let components: [Int]
|
||||
|
||||
init(_ raw: String) {
|
||||
self.rawValue = raw
|
||||
self.components = raw
|
||||
.split(separator: ".")
|
||||
.map { Int($0) ?? 0 }
|
||||
}
|
||||
|
||||
var description: String { rawValue }
|
||||
|
||||
static func < (lhs: VersionNumber, rhs: VersionNumber) -> Bool {
|
||||
let maxCount = max(lhs.components.count, rhs.components.count)
|
||||
for index in 0..<maxCount {
|
||||
let left = index < lhs.components.count ? lhs.components[index] : 0
|
||||
let right = index < rhs.components.count ? rhs.components[index] : 0
|
||||
if left != right {
|
||||
return left < right
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
enum UpdateServiceError: LocalizedError {
|
||||
case invalidResponse
|
||||
case noReleasesAvailable
|
||||
case missingDownloadAsset
|
||||
|
||||
var errorDescription: String? {
|
||||
switch self {
|
||||
case .invalidResponse:
|
||||
return "The update server returned an invalid response."
|
||||
case .noReleasesAvailable:
|
||||
return "No releases are currently available."
|
||||
case .missingDownloadAsset:
|
||||
return "The release did not include downloadable artifacts."
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct UpdateService {
|
||||
private struct APIRelease: Decodable {
|
||||
struct Asset: Decodable {
|
||||
let name: String
|
||||
let browserDownloadURL: URL?
|
||||
|
||||
enum CodingKeys: String, CodingKey {
|
||||
case name
|
||||
case browserDownloadURL = "browser_download_url"
|
||||
}
|
||||
}
|
||||
|
||||
let tagName: String
|
||||
let body: String?
|
||||
let prerelease: Bool
|
||||
let draft: Bool
|
||||
let htmlURL: URL?
|
||||
let createdAt: Date
|
||||
let assets: [Asset]
|
||||
|
||||
enum CodingKeys: String, CodingKey {
|
||||
case tagName = "tag_name"
|
||||
case body
|
||||
case prerelease
|
||||
case draft
|
||||
case htmlURL = "html_url"
|
||||
case createdAt = "created_at"
|
||||
case assets
|
||||
}
|
||||
}
|
||||
|
||||
private let baseURL = URL(string: "https://git.24unix.net/api/v1")!
|
||||
private let owner = "tracer"
|
||||
private let repo = "iKeyMon"
|
||||
private let session: URLSession
|
||||
|
||||
init(session: URLSession = .shared) {
|
||||
self.session = session
|
||||
}
|
||||
|
||||
func fetchLatestRelease(includePrerelease: Bool) async throws -> ReleaseInfo {
|
||||
let releasesURL = baseURL
|
||||
.appendingPathComponent("repos")
|
||||
.appendingPathComponent(owner)
|
||||
.appendingPathComponent(repo)
|
||||
.appendingPathComponent("releases")
|
||||
|
||||
var request = URLRequest(url: releasesURL)
|
||||
request.addValue("application/json", forHTTPHeaderField: "Accept")
|
||||
|
||||
let (data, response) = try await session.data(for: request)
|
||||
guard let httpResponse = response as? HTTPURLResponse,
|
||||
200..<300 ~= httpResponse.statusCode else {
|
||||
throw UpdateServiceError.invalidResponse
|
||||
}
|
||||
|
||||
let decoder = JSONDecoder()
|
||||
decoder.dateDecodingStrategy = .iso8601
|
||||
let releases = try decoder.decode([APIRelease].self, from: data)
|
||||
|
||||
let filtered = releases
|
||||
.filter { !$0.draft }
|
||||
.filter { includePrerelease || !$0.prerelease }
|
||||
.sorted(by: { $0.createdAt > $1.createdAt })
|
||||
|
||||
guard let release = filtered.first else {
|
||||
throw UpdateServiceError.noReleasesAvailable
|
||||
}
|
||||
|
||||
guard let asset = preferredAsset(from: release.assets),
|
||||
let downloadURL = asset.browserDownloadURL else {
|
||||
throw UpdateServiceError.missingDownloadAsset
|
||||
}
|
||||
|
||||
let cleanTag = release.tagName.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
let version = cleanTag.hasPrefix("v") ? String(cleanTag.dropFirst()) : cleanTag
|
||||
|
||||
return ReleaseInfo(
|
||||
version: VersionNumber(version),
|
||||
versionString: version,
|
||||
notes: release.body ?? "",
|
||||
downloadURL: downloadURL,
|
||||
releaseURL: release.htmlURL ?? releasesURL,
|
||||
prerelease: release.prerelease
|
||||
)
|
||||
}
|
||||
|
||||
private func preferredAsset(from assets: [APIRelease.Asset]) -> APIRelease.Asset? {
|
||||
return assets
|
||||
.sorted { lhs, rhs in
|
||||
priority(for: lhs.name) > priority(for: rhs.name)
|
||||
}
|
||||
.first(where: { $0.browserDownloadURL != nil })
|
||||
}
|
||||
|
||||
private func priority(for name: String) -> Int {
|
||||
if name.lowercased().hasSuffix(".dmg") {
|
||||
return 3
|
||||
}
|
||||
if name.lowercased().hasSuffix(".zip") {
|
||||
return 2
|
||||
}
|
||||
return 1
|
||||
}
|
||||
}
|
||||
26
Sources/ViewModels/SparkleUpdater.swift
Normal file
26
Sources/ViewModels/SparkleUpdater.swift
Normal file
@@ -0,0 +1,26 @@
|
||||
import Sparkle
|
||||
import Foundation
|
||||
|
||||
@MainActor
|
||||
final class SparkleUpdater: NSObject, ObservableObject {
|
||||
let controller: SPUStandardUpdaterController
|
||||
|
||||
override init() {
|
||||
self.controller = SPUStandardUpdaterController(startingUpdater: true, updaterDelegate: nil, userDriverDelegate: nil)
|
||||
super.init()
|
||||
}
|
||||
|
||||
var automaticallyChecksForUpdates: Bool {
|
||||
get { controller.updater.automaticallyChecksForUpdates }
|
||||
set { controller.updater.automaticallyChecksForUpdates = newValue }
|
||||
}
|
||||
|
||||
var automaticallyDownloadsUpdates: Bool {
|
||||
get { controller.updater.automaticallyDownloadsUpdates }
|
||||
set { controller.updater.automaticallyDownloadsUpdates = newValue }
|
||||
}
|
||||
|
||||
func checkForUpdates() {
|
||||
controller.checkForUpdates(nil)
|
||||
}
|
||||
}
|
||||
@@ -1,95 +0,0 @@
|
||||
import Foundation
|
||||
#if os(macOS)
|
||||
import AppKit
|
||||
#endif
|
||||
|
||||
@MainActor
|
||||
final class UpdateViewModel: ObservableObject {
|
||||
struct StatusAlert: Identifiable {
|
||||
let id = UUID()
|
||||
let title: String
|
||||
let message: String
|
||||
}
|
||||
|
||||
@Published var availableRelease: ReleaseInfo?
|
||||
@Published var latestFetchedRelease: ReleaseInfo?
|
||||
@Published var statusAlert: StatusAlert?
|
||||
@Published var isChecking = false
|
||||
|
||||
private let service: UpdateService
|
||||
private let userDefaults: UserDefaults
|
||||
private let autoCheckKey = "autoCheckUpdates"
|
||||
private let includePrereleaseKey = "includePrereleaseUpdates"
|
||||
|
||||
init(service: UpdateService = UpdateService(), userDefaults: UserDefaults = .standard) {
|
||||
self.service = service
|
||||
self.userDefaults = userDefaults
|
||||
registerDefaultsIfNeeded()
|
||||
}
|
||||
|
||||
func startAutomaticCheckIfNeeded() {
|
||||
if userDefaults.bool(forKey: autoCheckKey) {
|
||||
checkForUpdates(userInitiated: false)
|
||||
}
|
||||
}
|
||||
|
||||
func checkForUpdates(userInitiated: Bool) {
|
||||
guard !isChecking else { return }
|
||||
isChecking = true
|
||||
|
||||
Task {
|
||||
do {
|
||||
let release = try await service.fetchLatestRelease(includePrerelease: userDefaults.bool(forKey: includePrereleaseKey))
|
||||
handle(release: release, userInitiated: userInitiated)
|
||||
} catch {
|
||||
if userInitiated {
|
||||
statusAlert = StatusAlert(
|
||||
title: "Update Check Failed",
|
||||
message: error.localizedDescription
|
||||
)
|
||||
}
|
||||
}
|
||||
self.isChecking = false
|
||||
}
|
||||
}
|
||||
|
||||
func openReleaseNotes() {
|
||||
guard let releaseURL = availableRelease?.releaseURL ?? latestFetchedRelease?.releaseURL else { return }
|
||||
#if os(macOS)
|
||||
NSWorkspace.shared.open(releaseURL)
|
||||
#endif
|
||||
}
|
||||
|
||||
func downloadLatest() {
|
||||
let release = availableRelease ?? latestFetchedRelease
|
||||
availableRelease = nil
|
||||
guard let downloadURL = release?.downloadURL else { return }
|
||||
#if os(macOS)
|
||||
NSWorkspace.shared.open(downloadURL)
|
||||
#endif
|
||||
}
|
||||
|
||||
private func handle(release: ReleaseInfo, userInitiated: Bool) {
|
||||
let currentVersion = VersionNumber(
|
||||
Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "0.0.0"
|
||||
)
|
||||
|
||||
latestFetchedRelease = release
|
||||
|
||||
if release.version > currentVersion {
|
||||
availableRelease = release
|
||||
} else if userInitiated {
|
||||
statusAlert = StatusAlert(
|
||||
title: "You're Up To Date",
|
||||
message: "iKeyMon \(currentVersion.rawValue) is the latest version."
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private func registerDefaultsIfNeeded() {
|
||||
userDefaults.register(defaults: [
|
||||
autoCheckKey: true,
|
||||
includePrereleaseKey: true
|
||||
])
|
||||
}
|
||||
}
|
||||
@@ -12,15 +12,13 @@ struct MainView: View {
|
||||
private static let serverOrderKeyStatic = "serverOrder"
|
||||
private static let storedServersKeyStatic = "storedServers"
|
||||
|
||||
@EnvironmentObject private var updateViewModel: UpdateViewModel
|
||||
@EnvironmentObject private var sparkleUpdater: SparkleUpdater
|
||||
@State var showAddServerSheet: Bool = false
|
||||
@State private var serverBeingEdited: Server?
|
||||
@State private var serverToDelete: Server?
|
||||
@State private var showDeleteConfirmation = false
|
||||
@State private var isFetchingInfo: Bool = false
|
||||
@State private var refreshTimer = Timer.publish(every: 60, on: .main, in: .common).autoconnect()
|
||||
@State private var progress: Double = 0
|
||||
@State private var lastRefresh = Date()
|
||||
@State private var pingTimer: Timer?
|
||||
private let serverOrderKey = MainView.serverOrderKeyStatic
|
||||
private let storedServersKey = MainView.storedServersKeyStatic
|
||||
@@ -64,15 +62,10 @@ struct MainView: View {
|
||||
}
|
||||
ToolbarItem {
|
||||
Button {
|
||||
updateViewModel.checkForUpdates(userInitiated: true)
|
||||
sparkleUpdater.checkForUpdates()
|
||||
} label: {
|
||||
if updateViewModel.isChecking {
|
||||
ProgressView()
|
||||
.scaleEffect(0.6)
|
||||
} else {
|
||||
Image(systemName: "square.and.arrow.down")
|
||||
}
|
||||
}
|
||||
.help("Check for Updates")
|
||||
}
|
||||
}
|
||||
@@ -144,26 +137,8 @@ struct MainView: View {
|
||||
pingTimer = Timer.scheduledTimer(withTimeInterval: 10.0, repeats: true) { _ in
|
||||
pingAllServers()
|
||||
}
|
||||
updateViewModel.startAutomaticCheckIfNeeded()
|
||||
}
|
||||
.frame(minWidth: 800, minHeight: 450)
|
||||
.alert(item: availableReleaseBinding) { release in
|
||||
Alert(
|
||||
title: Text("Update Available"),
|
||||
message: Text("iKeyMon \(release.versionString) is available."),
|
||||
primaryButton: .default(Text("Download")) {
|
||||
updateViewModel.downloadLatest()
|
||||
},
|
||||
secondaryButton: .cancel(Text("Later"))
|
||||
)
|
||||
}
|
||||
.alert(item: statusAlertBinding) { alert in
|
||||
Alert(
|
||||
title: Text(alert.title),
|
||||
message: Text(alert.message),
|
||||
dismissButton: .default(Text("OK"))
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private func fetchServerInfo(for id: UUID) {
|
||||
@@ -290,23 +265,9 @@ struct MainView: View {
|
||||
return []
|
||||
}
|
||||
}
|
||||
|
||||
private var availableReleaseBinding: Binding<ReleaseInfo?> {
|
||||
Binding(
|
||||
get: { updateViewModel.availableRelease },
|
||||
set: { updateViewModel.availableRelease = $0 }
|
||||
)
|
||||
}
|
||||
|
||||
private var statusAlertBinding: Binding<UpdateViewModel.StatusAlert?> {
|
||||
Binding(
|
||||
get: { updateViewModel.statusAlert },
|
||||
set: { updateViewModel.statusAlert = $0 }
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
#Preview {
|
||||
MainView()
|
||||
.environmentObject(UpdateViewModel())
|
||||
.environmentObject(SparkleUpdater())
|
||||
}
|
||||
|
||||
@@ -22,13 +22,11 @@ struct PreferencesView: View {
|
||||
}
|
||||
}
|
||||
}
|
||||
@EnvironmentObject private var updateViewModel: UpdateViewModel
|
||||
@EnvironmentObject private var sparkleUpdater: SparkleUpdater
|
||||
|
||||
@AppStorage("pingInterval") private var storedPingInterval: Int = 10
|
||||
@AppStorage("refreshInterval") private var storedRefreshInterval: Int = 60
|
||||
@AppStorage("showIntervalIndicator") private var showIntervalIndicator: Bool = true
|
||||
@AppStorage("autoCheckUpdates") private var autoCheckUpdates: Bool = true
|
||||
@AppStorage("includePrereleaseUpdates") private var includePrereleaseUpdates: Bool = true
|
||||
|
||||
@State private var pingIntervalSlider: Double = 10
|
||||
@State private var refreshIntervalSlider: Double = 60
|
||||
@@ -126,11 +124,8 @@ struct PreferencesView: View {
|
||||
case .alerts:
|
||||
AlertsPreferencesView()
|
||||
case .updates:
|
||||
UpdatesPreferencesView(
|
||||
autoCheckUpdates: $autoCheckUpdates,
|
||||
includePrereleaseUpdates: $includePrereleaseUpdates
|
||||
)
|
||||
.environmentObject(updateViewModel)
|
||||
UpdatesPreferencesView()
|
||||
.environmentObject(sparkleUpdater)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -232,46 +227,39 @@ private struct MonitorPreferencesView: View {
|
||||
}
|
||||
|
||||
private struct UpdatesPreferencesView: View {
|
||||
@Binding var autoCheckUpdates: Bool
|
||||
@Binding var includePrereleaseUpdates: Bool
|
||||
@EnvironmentObject var updateViewModel: UpdateViewModel
|
||||
@EnvironmentObject var sparkleUpdater: SparkleUpdater
|
||||
|
||||
private var automaticallyChecksBinding: Binding<Bool> {
|
||||
Binding(
|
||||
get: { sparkleUpdater.automaticallyChecksForUpdates },
|
||||
set: { sparkleUpdater.automaticallyChecksForUpdates = $0 }
|
||||
)
|
||||
}
|
||||
|
||||
private var automaticallyDownloadsBinding: Binding<Bool> {
|
||||
Binding(
|
||||
get: { sparkleUpdater.automaticallyDownloadsUpdates },
|
||||
set: { sparkleUpdater.automaticallyDownloadsUpdates = $0 }
|
||||
)
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
VStack(alignment: .leading, spacing: 16) {
|
||||
Toggle("Automatically check for updates", isOn: $autoCheckUpdates)
|
||||
.toggleStyle(.switch)
|
||||
VStack(alignment: .leading, spacing: 18) {
|
||||
Toggle("Automatically check for updates", isOn: automaticallyChecksBinding)
|
||||
Toggle("Automatically download updates", isOn: automaticallyDownloadsBinding)
|
||||
|
||||
Toggle("Include pre-release builds", isOn: $includePrereleaseUpdates)
|
||||
.toggleStyle(.switch)
|
||||
|
||||
HStack {
|
||||
if updateViewModel.isChecking {
|
||||
ProgressView()
|
||||
.progressViewStyle(.circular)
|
||||
Text("Checking for updates…")
|
||||
.foregroundColor(.secondary)
|
||||
} else {
|
||||
Button("Check Now") {
|
||||
updateViewModel.checkForUpdates(userInitiated: true)
|
||||
}
|
||||
}
|
||||
Button(action: sparkleUpdater.checkForUpdates) {
|
||||
Label("Check for Updates Now", systemImage: "sparkles")
|
||||
}
|
||||
|
||||
if let release = updateViewModel.latestFetchedRelease {
|
||||
VStack(alignment: .leading, spacing: 4) {
|
||||
Text("Latest available: \(release.versionString)")
|
||||
.font(.subheadline)
|
||||
if release.prerelease {
|
||||
Text("Pre-release build")
|
||||
Text("Updates are delivered via Sparkle. Configure your appcast URL and public EdDSA key in Info.plist (keys `SUFeedURL` and `SUPublicEDKey`).")
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
}
|
||||
.padding(.top, 4)
|
||||
}
|
||||
|
||||
Spacer()
|
||||
}
|
||||
.toggleStyle(.switch)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ import AppKit
|
||||
|
||||
@main
|
||||
struct iKeyMonApp: App {
|
||||
@StateObject private var updateViewModel = UpdateViewModel()
|
||||
@StateObject private var sparkleUpdater = SparkleUpdater()
|
||||
|
||||
init() {
|
||||
#if os(macOS)
|
||||
@@ -25,7 +25,7 @@ struct iKeyMonApp: App {
|
||||
var body: some Scene {
|
||||
WindowGroup {
|
||||
MainView()
|
||||
.environmentObject(updateViewModel)
|
||||
.environmentObject(sparkleUpdater)
|
||||
.onDisappear {
|
||||
NSApp.terminate(nil)
|
||||
}
|
||||
@@ -35,7 +35,7 @@ struct iKeyMonApp: App {
|
||||
Settings {
|
||||
PreferencesView()
|
||||
.padding()
|
||||
.environmentObject(updateViewModel)
|
||||
.environmentObject(sparkleUpdater)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
30
Sparkle/appcast.xml
vendored
Normal file
30
Sparkle/appcast.xml
vendored
Normal file
@@ -0,0 +1,30 @@
|
||||
<?xml version="1.0" standalone="yes"?>
|
||||
<rss xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" version="2.0">
|
||||
<channel>
|
||||
<title>iKeyMon</title>
|
||||
<item>
|
||||
<title>26.0.16</title>
|
||||
<pubDate>Tue, 25 Nov 2025 18:34:19 +0100</pubDate>
|
||||
<sparkle:version>39</sparkle:version>
|
||||
<sparkle:shortVersionString>26.0.16</sparkle:shortVersionString>
|
||||
<sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion>
|
||||
<enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.0.16/iKeyMon-26.0.16.zip" length="4801351" type="application/octet-stream" sparkle:edSignature="lbQEpxEElRxwyRdm0LQIxsnfh8o8Kt66wQlcl4PBs68lBmjkq0b/5EsVCElWQb0Nei/GCk6I/m2mSNL7mA3wBQ=="/>
|
||||
</item>
|
||||
<item>
|
||||
<title>26.0.15</title>
|
||||
<pubDate>Tue, 25 Nov 2025 18:11:17 +0100</pubDate>
|
||||
<sparkle:version>35</sparkle:version>
|
||||
<sparkle:shortVersionString>26.0.15</sparkle:shortVersionString>
|
||||
<sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion>
|
||||
<enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.0.15/iKeyMon-26.0.15.zip" length="4801128" type="application/octet-stream" sparkle:edSignature="T16+tX44yN2UqIUsMJeZAxydOuLC6lcQQrlRElTkJlSWPheWLy9xPjP4T45mNSOcWTax0gRCnI50ab3geL9XAA=="/>
|
||||
</item>
|
||||
<item>
|
||||
<title>26.0.15</title>
|
||||
<pubDate>Tue, 25 Nov 2025 17:42:56 +0100</pubDate>
|
||||
<sparkle:version>34</sparkle:version>
|
||||
<sparkle:shortVersionString>26.0.15</sparkle:shortVersionString>
|
||||
<sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion>
|
||||
<enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.0.15/iKeyMon-26.0.15.zip" length="4800821" type="application/octet-stream" sparkle:edSignature="bojJ638CY0n+34POoJX3OBrXRAiPOYPiDTfgJOS9fCslw8YGKZLviJvcExC2PKh1HDt0Raabo0FJUJrAFUMmBQ=="/>
|
||||
</item>
|
||||
</channel>
|
||||
</rss>
|
||||
62
hooks/pre-push
Executable file
62
hooks/pre-push
Executable file
@@ -0,0 +1,62 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
REMOTE_NAME="${1:-origin}"
|
||||
|
||||
if [[ -n "${SKIP_RELEASE:-}" ]]; then
|
||||
echo "⚙️ SKIP_RELEASE set — skipping automated release build."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
should_release=false
|
||||
release_local_ref=""
|
||||
release_remote_ref=""
|
||||
while read -r local_ref local_sha remote_ref remote_sha; do
|
||||
[[ -z "${local_ref:-}" ]] && continue
|
||||
if [[ "$local_ref" == "refs/heads/master" || "$remote_ref" == "refs/heads/master" ]]; then
|
||||
should_release=true
|
||||
release_local_ref="$local_ref"
|
||||
release_remote_ref="${remote_ref:-refs/heads/master}"
|
||||
fi
|
||||
done
|
||||
|
||||
if [[ "$should_release" != true ]]; then
|
||||
current_branch="$(git -C "$ROOT_DIR" symbolic-ref --short -q HEAD || true)"
|
||||
if [[ "$current_branch" == "master" ]]; then
|
||||
should_release=true
|
||||
release_local_ref="refs/heads/master"
|
||||
release_remote_ref="refs/heads/master"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ "$should_release" != true ]]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "🚀 Detected push to master — bumping version and building release..."
|
||||
NEW_VERSION="$("$ROOT_DIR/scripts/bump_version.sh")"
|
||||
echo "🔢 marketing_version -> ${NEW_VERSION}"
|
||||
"$ROOT_DIR/scripts/sync_version.sh"
|
||||
|
||||
git -C "$ROOT_DIR" add "$ROOT_DIR/version.json" "$ROOT_DIR/iKeyMon.xcodeproj/project.pbxproj"
|
||||
|
||||
"$ROOT_DIR/scripts/build_release.sh"
|
||||
|
||||
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 "⚠️ No release changes detected; skipping release commit."
|
||||
else
|
||||
git -C "$ROOT_DIR" commit -m "chore: release ${NEW_VERSION}"
|
||||
echo "📝 Committed release ${NEW_VERSION}."
|
||||
fi
|
||||
|
||||
echo "📤 Pushing release commit..."
|
||||
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 ${NEW_VERSION} pushed. Original push cancelled (already done)."
|
||||
exit 1
|
||||
else
|
||||
echo "❌ Failed to push release ${NEW_VERSION}. Please resolve manually."
|
||||
exit 1
|
||||
fi
|
||||
10
iKeyMon-Info.plist
Normal file
10
iKeyMon-Info.plist
Normal file
@@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>SUFeedURL</key>
|
||||
<string>https://git.24unix.net/tracer/iKeyMon/raw/branch/master/Sparkle/appcast.xml</string>
|
||||
<key>SUPublicEDKey</key>
|
||||
<string>EgJgrOGQ79L5me616jA7kDCEOgx+Rg11uYLYLLIyzTI=</string>
|
||||
</dict>
|
||||
</plist>
|
||||
@@ -10,8 +10,22 @@
|
||||
52A9B79F2EC8E7EE004DD4A2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 52A9B7872EC8E7EE004DD4A2 /* Assets.xcassets */; };
|
||||
52A9B8222EC8FA8A004DD4A2 /* CHANGELOG.md in Resources */ = {isa = PBXBuildFile; fileRef = 52A9B8212EC8FA8A004DD4A2 /* CHANGELOG.md */; };
|
||||
52A9B9722ECF751C004DD4A2 /* signing.env.example in Resources */ = {isa = PBXBuildFile; fileRef = 52A9B9712ECF751C004DD4A2 /* signing.env.example */; };
|
||||
52A9BD112ED377F7004DD4A2 /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = 52A9BD102ED377F7004DD4A2 /* Sparkle */; };
|
||||
52A9BECA2ED3874F004DD4A2 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 52A9BEC92ED3874F004DD4A2 /* README.md */; };
|
||||
/* End PBXBuildFile section */
|
||||
|
||||
/* Begin PBXCopyFilesBuildPhase section */
|
||||
52A9BD152ED37BD8004DD4A2 /* CopyFiles */ = {
|
||||
isa = PBXCopyFilesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
dstPath = "";
|
||||
dstSubfolderSpec = 6;
|
||||
files = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
/* End PBXCopyFilesBuildPhase section */
|
||||
|
||||
/* Begin PBXFileReference section */
|
||||
5203C24D2D997D2800576D4A /* iKeyMon.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iKeyMon.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
52A9B7872EC8E7EE004DD4A2 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
|
||||
@@ -19,6 +33,8 @@
|
||||
52A9B8212EC8FA8A004DD4A2 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
|
||||
52A9B8BA2ECA35FB004DD4A2 /* NOTES.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = NOTES.md; sourceTree = "<group>"; };
|
||||
52A9B9712ECF751C004DD4A2 /* signing.env.example */ = {isa = PBXFileReference; lastKnownFileType = text; path = signing.env.example; sourceTree = "<group>"; };
|
||||
52A9BEC92ED3874F004DD4A2 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
|
||||
52A9C38F2ED4D753004DD4A2 /* iKeyMon-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "iKeyMon-Info.plist"; sourceTree = "<group>"; };
|
||||
/* End PBXFileReference section */
|
||||
|
||||
/* Begin PBXFileSystemSynchronizedRootGroup section */
|
||||
@@ -39,6 +55,7 @@
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
52A9BD112ED377F7004DD4A2 /* Sparkle in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -48,6 +65,7 @@
|
||||
5203C2442D997D2800576D4A = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
52A9C38F2ED4D753004DD4A2 /* iKeyMon-Info.plist */,
|
||||
52A9B8BE2ECB68B5004DD4A2 /* Sources */,
|
||||
52A9B7872EC8E7EE004DD4A2 /* Assets.xcassets */,
|
||||
52A9B7882EC8E7EE004DD4A2 /* iKeyMon.entitlements */,
|
||||
@@ -56,6 +74,8 @@
|
||||
52A9B8212EC8FA8A004DD4A2 /* CHANGELOG.md */,
|
||||
52A9B8BA2ECA35FB004DD4A2 /* NOTES.md */,
|
||||
52A9B9712ECF751C004DD4A2 /* signing.env.example */,
|
||||
52A9BEC92ED3874F004DD4A2 /* README.md */,
|
||||
52A9BD122ED37E08004DD4A2 /* Frameworks */,
|
||||
);
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
@@ -67,6 +87,13 @@
|
||||
name = Products;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
52A9BD122ED37E08004DD4A2 /* Frameworks */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
);
|
||||
name = Frameworks;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
/* End PBXGroup section */
|
||||
|
||||
/* Begin PBXNativeTarget section */
|
||||
@@ -77,6 +104,7 @@
|
||||
5203C2492D997D2800576D4A /* Sources */,
|
||||
5203C24A2D997D2800576D4A /* Frameworks */,
|
||||
5203C24B2D997D2800576D4A /* Resources */,
|
||||
52A9BD152ED37BD8004DD4A2 /* CopyFiles */,
|
||||
);
|
||||
buildRules = (
|
||||
);
|
||||
@@ -88,6 +116,7 @@
|
||||
);
|
||||
name = iKeyMon;
|
||||
packageProductDependencies = (
|
||||
52A9BD102ED377F7004DD4A2 /* Sparkle */,
|
||||
);
|
||||
productName = iKeyMon;
|
||||
productReference = 5203C24D2D997D2800576D4A /* iKeyMon.app */;
|
||||
@@ -117,6 +146,9 @@
|
||||
);
|
||||
mainGroup = 5203C2442D997D2800576D4A;
|
||||
minimizedProjectReferenceProxies = 1;
|
||||
packageReferences = (
|
||||
52A9BD0F2ED377F7004DD4A2 /* XCRemoteSwiftPackageReference "Sparkle" */,
|
||||
);
|
||||
preferredProjectObjectVersion = 77;
|
||||
productRefGroup = 5203C24E2D997D2800576D4A /* Products */;
|
||||
projectDirPath = "";
|
||||
@@ -133,6 +165,7 @@
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
52A9B8222EC8FA8A004DD4A2 /* CHANGELOG.md in Resources */,
|
||||
52A9BECA2ED3874F004DD4A2 /* README.md in Resources */,
|
||||
52A9B79F2EC8E7EE004DD4A2 /* Assets.xcassets in Resources */,
|
||||
52A9B9722ECF751C004DD4A2 /* signing.env.example in Resources */,
|
||||
);
|
||||
@@ -277,19 +310,22 @@
|
||||
CODE_SIGN_ENTITLEMENTS = iKeyMon.entitlements;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
COMBINE_HIDPI_IMAGES = YES;
|
||||
CURRENT_PROJECT_VERSION = 31;
|
||||
CURRENT_PROJECT_VERSION = 41;
|
||||
DEVELOPMENT_ASSET_PATHS = "\"Preview Content\"";
|
||||
DEVELOPMENT_TEAM = Q5486ZVAFT;
|
||||
ENABLE_HARDENED_RUNTIME = YES;
|
||||
ENABLE_PREVIEWS = YES;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_FILE = "iKeyMon-Info.plist";
|
||||
INFOPLIST_KEY_CFBundleIconName = AppIcon;
|
||||
INFOPLIST_KEY_NSHumanReadableCopyright = "";
|
||||
INFOPLIST_KEY_SUFeedURL = "https://git.24unix.net/tracer/iKeyMon/releases/appcast.xml";
|
||||
INFOPLIST_KEY_SUPublicEDKey = "EgJgrOGQ79L5me616jA7kDCEOgx+Rg11uYLYLLIyzTI=";
|
||||
LD_RUNPATH_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"@executable_path/../Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 26.0.4;
|
||||
MARKETING_VERSION = 26.0.17;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = net.24unix.iKeyMon;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_EMIT_LOC_STRINGS = YES;
|
||||
@@ -305,19 +341,22 @@
|
||||
CODE_SIGN_ENTITLEMENTS = iKeyMon.entitlements;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
COMBINE_HIDPI_IMAGES = YES;
|
||||
CURRENT_PROJECT_VERSION = 31;
|
||||
CURRENT_PROJECT_VERSION = 41;
|
||||
DEVELOPMENT_ASSET_PATHS = "\"Preview Content\"";
|
||||
DEVELOPMENT_TEAM = Q5486ZVAFT;
|
||||
ENABLE_HARDENED_RUNTIME = YES;
|
||||
ENABLE_PREVIEWS = YES;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_FILE = "iKeyMon-Info.plist";
|
||||
INFOPLIST_KEY_CFBundleIconName = AppIcon;
|
||||
INFOPLIST_KEY_NSHumanReadableCopyright = "";
|
||||
INFOPLIST_KEY_SUFeedURL = "https://git.24unix.net/tracer/iKeyMon/releases/appcast.xml";
|
||||
INFOPLIST_KEY_SUPublicEDKey = "EgJgrOGQ79L5me616jA7kDCEOgx+Rg11uYLYLLIyzTI=";
|
||||
LD_RUNPATH_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"@executable_path/../Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 26.0.4;
|
||||
MARKETING_VERSION = 26.0.17;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = net.24unix.iKeyMon;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_EMIT_LOC_STRINGS = YES;
|
||||
@@ -347,6 +386,25 @@
|
||||
defaultConfigurationName = Release;
|
||||
};
|
||||
/* End XCConfigurationList section */
|
||||
|
||||
/* Begin XCRemoteSwiftPackageReference section */
|
||||
52A9BD0F2ED377F7004DD4A2 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
|
||||
isa = XCRemoteSwiftPackageReference;
|
||||
repositoryURL = "https://github.com/sparkle-project/Sparkle";
|
||||
requirement = {
|
||||
kind = upToNextMajorVersion;
|
||||
minimumVersion = 2.8.1;
|
||||
};
|
||||
};
|
||||
/* End XCRemoteSwiftPackageReference section */
|
||||
|
||||
/* Begin XCSwiftPackageProductDependency section */
|
||||
52A9BD102ED377F7004DD4A2 /* Sparkle */ = {
|
||||
isa = XCSwiftPackageProductDependency;
|
||||
package = 52A9BD0F2ED377F7004DD4A2 /* XCRemoteSwiftPackageReference "Sparkle" */;
|
||||
productName = Sparkle;
|
||||
};
|
||||
/* End XCSwiftPackageProductDependency section */
|
||||
};
|
||||
rootObject = 5203C2452D997D2800576D4A /* Project object */;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
{
|
||||
"originHash" : "e721da7f9826abdffcb6185e886155efa2514bd6234475f1afa893e29eb258d6",
|
||||
"pins" : [
|
||||
{
|
||||
"identity" : "sparkle",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/sparkle-project/Sparkle",
|
||||
"state" : {
|
||||
"revision" : "5581748cef2bae787496fe6d61139aebe0a451f6",
|
||||
"version" : "2.8.1"
|
||||
}
|
||||
}
|
||||
],
|
||||
"version" : 3
|
||||
}
|
||||
@@ -8,6 +8,100 @@ SCHEME="iKeyMon"
|
||||
PROJECT="iKeyMon.xcodeproj"
|
||||
CREDENTIALS_FILE="$ROOT_DIR/.signing.env"
|
||||
VERSION_FILE="$ROOT_DIR/version.json"
|
||||
DERIVED_DATA_ROOT="${DERIVED_DATA_ROOT:-$HOME/Library/Developer/Xcode/DerivedData}"
|
||||
|
||||
find_generate_appcast() {
|
||||
if [[ -n "${SPARKLE_GENERATE_APPCAST:-}" && -x "${SPARKLE_GENERATE_APPCAST}" ]]; then
|
||||
echo "$SPARKLE_GENERATE_APPCAST"
|
||||
return
|
||||
fi
|
||||
|
||||
if [[ -d "$DERIVED_DATA_ROOT" ]]; then
|
||||
local candidate
|
||||
candidate="$(find "$DERIVED_DATA_ROOT" -path "*/SourcePackages/artifacts/sparkle/Sparkle/bin/generate_appcast" -type f 2>/dev/null | head -n 1 || true)"
|
||||
if [[ -n "$candidate" ]]; then
|
||||
echo "$candidate"
|
||||
return
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
generate_appcast() {
|
||||
local generator
|
||||
generator="$(find_generate_appcast)"
|
||||
local download_prefix="${SPARKLE_DOWNLOAD_BASE_URL:-}"
|
||||
local subdir_template="${SPARKLE_DOWNLOAD_SUBDIR_TEMPLATE:-}"
|
||||
|
||||
if [[ -z "$generator" || -z "${SPARKLE_EDDSA_KEY_FILE:-}" || -z "$download_prefix" ]]; then
|
||||
echo "ℹ️ Skipping Sparkle appcast generation (generator/key/download prefix not configured)."
|
||||
return
|
||||
fi
|
||||
|
||||
download_prefix="${download_prefix%/}"
|
||||
local output="$SPARKLE_APPCAST_OUTPUT"
|
||||
mkdir -p "$(dirname "$output")"
|
||||
|
||||
local staging_dir
|
||||
staging_dir="$(mktemp -d)"
|
||||
local zip_found=false
|
||||
shopt -s nullglob
|
||||
for zip_path in "$ARTIFACTS_DIR"/*.zip; do
|
||||
zip_found=true
|
||||
local filename version_guess target_dir subdir
|
||||
filename="$(basename "$zip_path")"
|
||||
if [[ "$filename" =~ ([0-9]+\.[0-9]+\.[0-9]+) ]]; then
|
||||
version_guess="${BASH_REMATCH[1]}"
|
||||
else
|
||||
version_guess="$VERSION"
|
||||
fi
|
||||
|
||||
target_dir="$staging_dir"
|
||||
if [[ -n "$subdir_template" ]]; then
|
||||
subdir="$subdir_template"
|
||||
subdir="${subdir//\{\{VERSION\}\}/$version_guess}"
|
||||
subdir="${subdir//\{\{SHORT_VERSION\}\}/$version_guess}"
|
||||
subdir="${subdir//\{\{TAG\}\}/v$version_guess}"
|
||||
subdir="${subdir#/}"
|
||||
subdir="${subdir%/}"
|
||||
if [[ -n "$subdir" ]]; then
|
||||
target_dir="$staging_dir/$subdir"
|
||||
mkdir -p "$target_dir"
|
||||
fi
|
||||
fi
|
||||
|
||||
cp "$zip_path" "$target_dir/"
|
||||
done
|
||||
shopt -u nullglob
|
||||
|
||||
if [[ "$zip_found" != true ]]; then
|
||||
echo "ℹ️ Skipping Sparkle appcast generation (no ZIP archives found)."
|
||||
rm -rf "$staging_dir"
|
||||
return
|
||||
fi
|
||||
|
||||
echo "🧾 Generating Sparkle appcast at $output"
|
||||
if ! "$generator" \
|
||||
--download-url-prefix "$download_prefix" \
|
||||
--ed-key-file "$SPARKLE_EDDSA_KEY_FILE" \
|
||||
-o "$output" \
|
||||
"$staging_dir"; then
|
||||
echo "⚠️ Sparkle appcast generation failed."
|
||||
fi
|
||||
rm -rf "$staging_dir"
|
||||
}
|
||||
|
||||
sign_update_artifacts() {
|
||||
local signer
|
||||
signer="$(find "$DERIVED_DATA_ROOT" -path "*/SourcePackages/artifacts/sparkle/Sparkle/bin/sign_update" -type f 2>/dev/null | head -n 1 || true)"
|
||||
if [[ -z "$signer" || -z "${SPARKLE_EDDSA_KEY_FILE:-}" ]]; then
|
||||
echo "ℹ️ Skipping Sparkle signing (sign_update or SPARKLE_EDDSA_KEY_FILE missing)."
|
||||
return
|
||||
fi
|
||||
echo "🔑 Signing ${ZIP_NAME} for Sparkle feed"
|
||||
if ! "$signer" "${ARTIFACTS_DIR}/${ZIP_NAME}" --ed-key-file "${SPARKLE_EDDSA_KEY_FILE}"; then
|
||||
echo "⚠️ sign_update failed (continuing without signature)"
|
||||
fi
|
||||
}
|
||||
|
||||
if [[ -f "$CREDENTIALS_FILE" ]]; then
|
||||
set -a
|
||||
@@ -16,6 +110,9 @@ if [[ -f "$CREDENTIALS_FILE" ]]; then
|
||||
set +a
|
||||
fi
|
||||
|
||||
: "${SPARKLE_APPCAST_OUTPUT:=$ROOT_DIR/Sparkle/appcast.xml}"
|
||||
export SPARKLE_APPCAST_OUTPUT
|
||||
|
||||
"$ROOT_DIR/scripts/sync_version.sh"
|
||||
|
||||
rm -rf "$BUILD_DIR" "$ARTIFACTS_DIR"
|
||||
@@ -71,6 +168,8 @@ popd >/dev/null
|
||||
DMG_NAME="iKeyMon-${VERSION}.dmg"
|
||||
hdiutil create -volname "iKeyMon" -srcfolder "$STAGING_DIR" -ov -format UDZO "$ARTIFACTS_DIR/$DMG_NAME"
|
||||
|
||||
sign_update_artifacts
|
||||
|
||||
if [[ -n "${NOTARY_APPLE_ID:-}" && -n "${NOTARY_TEAM_ID:-}" && -n "${NOTARY_PASSWORD:-}" ]]; then
|
||||
echo "📝 Submitting DMG for notarization..."
|
||||
xcrun notarytool submit "$ARTIFACTS_DIR/$DMG_NAME" \
|
||||
@@ -84,6 +183,8 @@ else
|
||||
fi
|
||||
rm -rf "$STAGING_DIR"
|
||||
|
||||
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"
|
||||
else
|
||||
|
||||
24
scripts/bump_version.sh
Executable file
24
scripts/bump_version.sh
Executable file
@@ -0,0 +1,24 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
VERSION_FILE="$ROOT_DIR/version.json"
|
||||
|
||||
new_version="$(python3 - "$VERSION_FILE" <<'PY'
|
||||
import json, sys, pathlib
|
||||
path = pathlib.Path(sys.argv[1])
|
||||
data = json.loads(path.read_text())
|
||||
current = data.get("marketing_version")
|
||||
if not current:
|
||||
raise SystemExit("marketing_version missing in version.json")
|
||||
parts = current.split(".")
|
||||
if len(parts) != 3 or not all(part.isdigit() for part in parts):
|
||||
raise SystemExit(f"Invalid marketing_version format: {current}")
|
||||
parts[-1] = str(int(parts[-1]) + 1)
|
||||
data["marketing_version"] = ".".join(parts)
|
||||
path.write_text(json.dumps(data, indent=2) + "\n")
|
||||
print(data["marketing_version"])
|
||||
PY
|
||||
)"
|
||||
|
||||
echo "$new_version"
|
||||
@@ -63,11 +63,28 @@ if [[ -z "$release_id" || "$release_id" == "null" ]]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
delete_existing_asset() {
|
||||
local filename="$1"
|
||||
local asset_id
|
||||
asset_id="$(curl -sS \
|
||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||
"${API_URL}/releases/${release_id}/assets" | jq -r --arg name "$filename" '.[] | select(.name == $name) | .id' | head -n 1)"
|
||||
if [[ -n "$asset_id" && "$asset_id" != "null" ]]; then
|
||||
echo "🗑️ Removing existing asset ${filename}"
|
||||
curl -sS \
|
||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||
-X DELETE \
|
||||
"${API_URL}/releases/${release_id}/assets/${asset_id}" >/dev/null
|
||||
fi
|
||||
}
|
||||
|
||||
upload_asset() {
|
||||
local file="$1"
|
||||
local filename
|
||||
filename="$(basename "$file")"
|
||||
|
||||
delete_existing_asset "$filename"
|
||||
|
||||
echo "⬆️ Uploading ${filename}"
|
||||
curl -sS \
|
||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||
|
||||
@@ -8,3 +8,10 @@ GITEA_REPO="iKeyMon"
|
||||
# GITEA_API_BASE="https://git.24unix.net/api/v1"
|
||||
# GITEA_TARGET_COMMIT="master"
|
||||
# GITEA_PRERELEASE="false"
|
||||
|
||||
# Sparkle appcast generation (optional)
|
||||
# SPARKLE_EDDSA_KEY_FILE="$HOME/.config/Sparkle/iKeyMon.key"
|
||||
# SPARKLE_DOWNLOAD_BASE_URL="https://git.24unix.net/tracer/iKeyMon/releases/download"
|
||||
# SPARKLE_DOWNLOAD_SUBDIR_TEMPLATE="v{{VERSION}}"
|
||||
# SPARKLE_APPCAST_OUTPUT="$ROOT_DIR/Sparkle/appcast.xml" # defaults to this path
|
||||
# SPARKLE_GENERATE_APPCAST="/path/to/generate_appcast" # auto-detected if unset
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
{
|
||||
"marketing_version": "26.0.4"
|
||||
"marketing_version": "26.0.17"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user