Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion BetterCapture/View/SettingsView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down