From f76d03a11db1f7165bea648c19811b33cf32833c Mon Sep 17 00:00:00 2001 From: Joshua Sattler <34030048+jsattler@users.noreply.github.com> Date: Sun, 8 Feb 2026 13:26:13 +0100 Subject: [PATCH] fix(settings): show correct version and website link - Update website link to jsattler.github.io/BetterCapture - Use full version number for MARKETING_VERSION in CI - Use short git SHA for build number in CI Closes #46 --- .github/workflows/prerelease.yml | 7 +++---- .github/workflows/release.yml | 8 +++----- BetterCapture/View/SettingsView.swift | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 40d26e9..d141e0e 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -73,10 +73,9 @@ jobs: - name: Update version in project run: | VERSION=${{ steps.version.outputs.version }} - # Extract major.minor for MARKETING_VERSION (strip pre-release suffix) - MARKETING_VERSION=$(echo "$VERSION" | grep -oE '^[0-9]+\.[0-9]+') - agvtool new-marketing-version "$MARKETING_VERSION" - agvtool new-version -all 1 + SHORT_SHA=$(git rev-parse --short HEAD) + agvtool new-marketing-version "$VERSION" + agvtool new-version -all "$SHORT_SHA" - name: Build application run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6e8f93d..b647108 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -83,11 +83,9 @@ jobs: - name: Update version in project run: | VERSION=${{ steps.version.outputs.version }} - # Extract major.minor for MARKETING_VERSION - MARKETING_VERSION=$(echo "$VERSION" | grep -oE '^[0-9]+\.[0-9]+') - # Use full version for display if it has patch - agvtool new-marketing-version "$MARKETING_VERSION" - agvtool new-version -all 1 + SHORT_SHA=$(git rev-parse --short HEAD) + agvtool new-marketing-version "$VERSION" + agvtool new-version -all "$SHORT_SHA" - name: Set Sparkle public key in Info.plist env: diff --git a/BetterCapture/View/SettingsView.swift b/BetterCapture/View/SettingsView.swift index 0403a01..82e62d8 100644 --- a/BetterCapture/View/SettingsView.swift +++ b/BetterCapture/View/SettingsView.swift @@ -258,7 +258,7 @@ struct AboutSection: View { LabeledContent("Version", value: "\(appVersion) (\(buildNumber))") LabeledContent("Website") { - Link("bettercapture.app", destination: URL(string: "https://bettercapture.app")!) + Link("jsattler.github.io/BetterCapture", destination: URL(string: "https://jsattler.github.io/BetterCapture")!) } LabeledContent("Source Code") {