Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
83710bc1fe | ||
|
|
7584863392 | ||
|
|
31584792e6 | ||
|
|
58fbe56298 | ||
|
|
4d87288f2f | ||
|
|
cda28cc6be | ||
|
|
df23c84474 | ||
|
|
2508c77f17 | ||
|
|
607e1236f7 |
@@ -9,7 +9,7 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
macos:
|
macos:
|
||||||
runs-on: macos-15
|
runs-on: macos-arm64
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- name: Build Meetingnotes
|
- name: Build Meetingnotes
|
||||||
@@ -22,6 +22,7 @@ jobs:
|
|||||||
-derivedDataPath "$RUNNER_TEMP/DerivedData"
|
-derivedDataPath "$RUNNER_TEMP/DerivedData"
|
||||||
ARCHS="arm64 x86_64"
|
ARCHS="arm64 x86_64"
|
||||||
ONLY_ACTIVE_ARCH=NO
|
ONLY_ACTIVE_ARCH=NO
|
||||||
|
PRODUCT_BUNDLE_IDENTIFIER=net.jamesbone.meetingnotes.ci
|
||||||
CODE_SIGNING_ALLOWED=NO
|
CODE_SIGNING_ALLOWED=NO
|
||||||
build
|
build
|
||||||
- name: Sign test build
|
- name: Sign test build
|
||||||
@@ -34,28 +35,15 @@ jobs:
|
|||||||
codesign -d --entitlements :- "$app_path" 2>&1 \
|
codesign -d --entitlements :- "$app_path" 2>&1 \
|
||||||
| grep -q 'com.apple.security.network.server'
|
| grep -q 'com.apple.security.network.server'
|
||||||
- name: Smoke test local API
|
- name: Smoke test local API
|
||||||
run: |
|
run: python3 scripts/smoke_test_api.py "$RUNNER_TEMP/DerivedData/Build/Products/Release/Meetingnotes.app"
|
||||||
defaults write net.jamesbone.meetingnotes muteDeckAPIEnabled -bool true
|
|
||||||
defaults write net.jamesbone.meetingnotes muteDeckAPIPort -int 19880
|
|
||||||
"$RUNNER_TEMP/DerivedData/Build/Products/Release/Meetingnotes.app/Contents/MacOS/Meetingnotes" >"$RUNNER_TEMP/meetingnotes.log" 2>&1 &
|
|
||||||
app_pid=$!
|
|
||||||
trap 'kill "$app_pid" 2>/dev/null || true' EXIT
|
|
||||||
|
|
||||||
for _ in {1..20}; do
|
|
||||||
if curl -fsS http://127.0.0.1:19880/api/info >"$RUNNER_TEMP/api-info.json"; then
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
sleep 1
|
|
||||||
done
|
|
||||||
|
|
||||||
grep -q '"name":"MeetingDebrief"' "$RUNNER_TEMP/api-info.json"
|
|
||||||
test "$(curl -sS -o /dev/null -w '%{http_code}' http://127.0.0.1:19880/api/recording/status)" = "401"
|
|
||||||
- name: Package test build
|
- name: Package test build
|
||||||
|
if: always()
|
||||||
run: |
|
run: |
|
||||||
app_path="$RUNNER_TEMP/DerivedData/Build/Products/Release/Meetingnotes.app"
|
app_path="$RUNNER_TEMP/DerivedData/Build/Products/Release/Meetingnotes.app"
|
||||||
ditto -c -k --sequesterRsrc --keepParent \
|
ditto -c -k --sequesterRsrc --keepParent \
|
||||||
"$app_path" "$RUNNER_TEMP/Meetingnotes-macOS.zip"
|
"$app_path" "$RUNNER_TEMP/Meetingnotes-macOS.zip"
|
||||||
- name: Upload test build
|
- name: Upload test build
|
||||||
|
if: always()
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: Meetingnotes-macOS-${{ github.sha }}
|
name: Meetingnotes-macOS-${{ github.sha }}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
name: Release
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
version:
|
||||||
|
description: Version from MARKETING_VERSION, without the v prefix
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
concurrency:
|
||||||
|
group: meetingnotes-release
|
||||||
|
cancel-in-progress: false
|
||||||
|
jobs:
|
||||||
|
release:
|
||||||
|
runs-on: macos-arm64
|
||||||
|
env:
|
||||||
|
VERSION: ${{ inputs.version }}
|
||||||
|
RELEASE_BASE_URL: https://git.jamesbone.net/coder/meetingnotes
|
||||||
|
APPLE_ID: ${{ secrets.APPLE_ID }}
|
||||||
|
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
|
||||||
|
APPLE_APP_PASSWORD: ${{ secrets.APPLE_APP_PASSWORD }}
|
||||||
|
SPARKLE_PRIVATE_KEY: ${{ secrets.SPARKLE_PRIVATE_KEY }}
|
||||||
|
steps:
|
||||||
|
- name: Require main
|
||||||
|
run: test "$GITHUB_REF" = refs/heads/main
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
- name: Build, sign, and notarize release
|
||||||
|
timeout-minutes: 45
|
||||||
|
env:
|
||||||
|
APPLE_CERTIFICATE_P12: ${{ secrets.APPLE_CERTIFICATE_P12 }}
|
||||||
|
APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
|
||||||
|
run: python3 scripts/with_signing_identity.py scripts/package_release.sh
|
||||||
|
- name: Preserve signed release artifacts
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: meetingnotes-signed-release-${{ github.run_id }}
|
||||||
|
path: ${{ runner.temp }}/meetingnotes-release/release
|
||||||
|
if-no-files-found: error
|
||||||
|
retention-days: 30
|
||||||
|
- name: Publish Gitea release
|
||||||
|
env:
|
||||||
|
GITEA_SERVER_URL: ${{ github.server_url }}
|
||||||
|
GITEA_TOKEN: ${{ github.token }}
|
||||||
|
run: python3 scripts/publish_gitea_release.py
|
||||||
@@ -1,92 +0,0 @@
|
|||||||
name: Finalize Notarization (manual)
|
|
||||||
|
|
||||||
on:
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
release_run_id:
|
|
||||||
description: Release workflow run ID; leave blank to use the latest pending run
|
|
||||||
required: false
|
|
||||||
type: string
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
actions: read
|
|
||||||
contents: write
|
|
||||||
|
|
||||||
concurrency:
|
|
||||||
group: meetingnotes-finalize-release
|
|
||||||
cancel-in-progress: false
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
finalize:
|
|
||||||
if: github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success'
|
|
||||||
runs-on: macos-15
|
|
||||||
env:
|
|
||||||
APPLE_ID: ${{ secrets.APPLE_ID }}
|
|
||||||
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
|
|
||||||
APPLE_APP_PASSWORD: ${{ secrets.APPLE_APP_PASSWORD }}
|
|
||||||
SPARKLE_PRIVATE_KEY: ${{ secrets.SPARKLE_PRIVATE_KEY }}
|
|
||||||
GH_TOKEN: ${{ github.token }}
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v7
|
|
||||||
|
|
||||||
- name: Validate release secrets
|
|
||||||
run: |
|
|
||||||
for variable in APPLE_ID APPLE_TEAM_ID APPLE_APP_PASSWORD SPARKLE_PRIVATE_KEY; do
|
|
||||||
if [[ -z "${!variable:-}" ]]; then
|
|
||||||
echo "Missing GitHub Actions secret: $variable" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
- name: Download pending signed build
|
|
||||||
id: submission
|
|
||||||
env:
|
|
||||||
MANUAL_RUN_ID: ${{ inputs.release_run_id }}
|
|
||||||
COMPLETED_RUN_ID: ${{ github.event.workflow_run.id }}
|
|
||||||
run: |
|
|
||||||
PENDING_DIR="$RUNNER_TEMP/meetingnotes-pending"
|
|
||||||
candidate_ids=()
|
|
||||||
if [[ -n "${MANUAL_RUN_ID:-}" ]]; then
|
|
||||||
candidate_ids+=("$MANUAL_RUN_ID")
|
|
||||||
elif [[ -n "${COMPLETED_RUN_ID:-}" ]]; then
|
|
||||||
candidate_ids+=("$COMPLETED_RUN_ID")
|
|
||||||
else
|
|
||||||
while IFS= read -r run_id; do
|
|
||||||
candidate_ids+=("$run_id")
|
|
||||||
done < <(gh run list --repo "$GITHUB_REPOSITORY" --workflow Release --status success --limit 20 --json databaseId --jq '.[].databaseId')
|
|
||||||
fi
|
|
||||||
|
|
||||||
for run_id in "${candidate_ids[@]}"; do
|
|
||||||
if [[ ! "$run_id" =~ ^[0-9]+$ ]]; then
|
|
||||||
echo "Invalid release run ID: $run_id" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
artifact_name="meetingnotes-notarization-$run_id"
|
|
||||||
artifact_count=$(gh api "repos/$GITHUB_REPOSITORY/actions/runs/$run_id/artifacts" \
|
|
||||||
--jq "[.artifacts[] | select(.name == \"$artifact_name\" and .expired == false)] | length")
|
|
||||||
if [[ "$artifact_count" == 0 ]]; then
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm -rf "$PENDING_DIR"
|
|
||||||
mkdir -p "$PENDING_DIR"
|
|
||||||
gh run download "$run_id" --repo "$GITHUB_REPOSITORY" --name "$artifact_name" --dir "$PENDING_DIR"
|
|
||||||
|
|
||||||
version=$(<"$PENDING_DIR/version")
|
|
||||||
if gh release view "v$version" --repo "$GITHUB_REPOSITORY" >/dev/null 2>&1; then
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "found=true" >> "$GITHUB_OUTPUT"
|
|
||||||
echo "run_id=$run_id" >> "$GITHUB_OUTPUT"
|
|
||||||
echo "Using release submission from workflow run $run_id"
|
|
||||||
exit 0
|
|
||||||
done
|
|
||||||
|
|
||||||
echo "found=false" >> "$GITHUB_OUTPUT"
|
|
||||||
echo "No pending release submission was found"
|
|
||||||
|
|
||||||
- name: Check notarization and publish when accepted
|
|
||||||
if: steps.submission.outputs.found == 'true'
|
|
||||||
run: scripts/finalize_release.sh
|
|
||||||
@@ -1,88 +0,0 @@
|
|||||||
name: Release
|
|
||||||
|
|
||||||
on:
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
version:
|
|
||||||
description: Version from MARKETING_VERSION, without the v prefix
|
|
||||||
required: true
|
|
||||||
type: string
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: write
|
|
||||||
|
|
||||||
concurrency:
|
|
||||||
group: meetingnotes-release
|
|
||||||
cancel-in-progress: false
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
release:
|
|
||||||
runs-on: macos-15
|
|
||||||
env:
|
|
||||||
VERSION: ${{ inputs.version }}
|
|
||||||
APPLE_ID: ${{ secrets.APPLE_ID }}
|
|
||||||
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
|
|
||||||
APPLE_APP_PASSWORD: ${{ secrets.APPLE_APP_PASSWORD }}
|
|
||||||
SPARKLE_PRIVATE_KEY: ${{ secrets.SPARKLE_PRIVATE_KEY }}
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v7
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: Validate release secrets
|
|
||||||
env:
|
|
||||||
APPLE_CERTIFICATE_P12: ${{ secrets.APPLE_CERTIFICATE_P12 }}
|
|
||||||
APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
|
|
||||||
run: |
|
|
||||||
for variable in APPLE_CERTIFICATE_P12 APPLE_CERTIFICATE_PASSWORD APPLE_ID APPLE_TEAM_ID APPLE_APP_PASSWORD SPARKLE_PRIVATE_KEY; do
|
|
||||||
if [[ -z "${!variable:-}" ]]; then
|
|
||||||
echo "Missing GitHub Actions secret: $variable" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
- name: Import Developer ID certificate
|
|
||||||
uses: apple-actions/import-codesign-certs@v7
|
|
||||||
with:
|
|
||||||
p12-file-base64: ${{ secrets.APPLE_CERTIFICATE_P12 }}
|
|
||||||
p12-password: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
|
|
||||||
|
|
||||||
- name: Locate Developer ID identity
|
|
||||||
run: |
|
|
||||||
signing_identity=$(security find-identity -v -p codesigning | awk -F '"' '/Developer ID Application/{print $2; exit}')
|
|
||||||
if [[ -z "$signing_identity" ]]; then
|
|
||||||
echo "The .p12 does not contain a Developer ID Application identity" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
echo "SIGNING_IDENTITY=$signing_identity" >> "$GITHUB_ENV"
|
|
||||||
|
|
||||||
- name: Build, sign, and notarize release
|
|
||||||
timeout-minutes: 30
|
|
||||||
run: scripts/package_release.sh
|
|
||||||
|
|
||||||
- name: Preserve signed release artifacts
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: meetingnotes-signed-release-${{ github.run_id }}
|
|
||||||
path: ${{ runner.temp }}/meetingnotes-release/release
|
|
||||||
if-no-files-found: error
|
|
||||||
retention-days: 30
|
|
||||||
|
|
||||||
- name: Publish signed GitHub release
|
|
||||||
env:
|
|
||||||
GH_TOKEN: ${{ github.token }}
|
|
||||||
run: |
|
|
||||||
tag="v$VERSION"
|
|
||||||
if gh release view "$tag" >/dev/null 2>&1; then
|
|
||||||
gh release upload "$tag" \
|
|
||||||
"$RUNNER_TEMP/meetingnotes-release/release/Meetingnotes-$VERSION.zip" \
|
|
||||||
"$RUNNER_TEMP/meetingnotes-release/release/appcast.xml" \
|
|
||||||
--clobber
|
|
||||||
else
|
|
||||||
gh release create "$tag" \
|
|
||||||
"$RUNNER_TEMP/meetingnotes-release/release/Meetingnotes-$VERSION.zip" \
|
|
||||||
"$RUNNER_TEMP/meetingnotes-release/release/appcast.xml" \
|
|
||||||
--target "$GITHUB_SHA" \
|
|
||||||
--title "Meetingnotes $VERSION" \
|
|
||||||
--generate-notes
|
|
||||||
fi
|
|
||||||
@@ -276,7 +276,7 @@
|
|||||||
CODE_SIGN_IDENTITY = "Apple Development";
|
CODE_SIGN_IDENTITY = "Apple Development";
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
COMBINE_HIDPI_IMAGES = YES;
|
COMBINE_HIDPI_IMAGES = YES;
|
||||||
CURRENT_PROJECT_VERSION = 43;
|
CURRENT_PROJECT_VERSION = 45;
|
||||||
DEVELOPMENT_ASSET_PATHS = "\"meetingnotes/Preview Content\"";
|
DEVELOPMENT_ASSET_PATHS = "\"meetingnotes/Preview Content\"";
|
||||||
DEVELOPMENT_TEAM = G9LVHZAJNX;
|
DEVELOPMENT_TEAM = G9LVHZAJNX;
|
||||||
ENABLE_HARDENED_RUNTIME = YES;
|
ENABLE_HARDENED_RUNTIME = YES;
|
||||||
@@ -290,7 +290,7 @@
|
|||||||
"@executable_path/../Frameworks",
|
"@executable_path/../Frameworks",
|
||||||
);
|
);
|
||||||
MACOSX_DEPLOYMENT_TARGET = 15.0;
|
MACOSX_DEPLOYMENT_TARGET = 15.0;
|
||||||
MARKETING_VERSION = 1.1.31;
|
MARKETING_VERSION = 1.1.33;
|
||||||
ONLY_ACTIVE_ARCH = NO;
|
ONLY_ACTIVE_ARCH = NO;
|
||||||
OTHER_SWIFT_FLAGS = "$(inherited) -D ENABLE_TCC_SPI";
|
OTHER_SWIFT_FLAGS = "$(inherited) -D ENABLE_TCC_SPI";
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = net.jamesbone.meetingnotes;
|
PRODUCT_BUNDLE_IDENTIFIER = net.jamesbone.meetingnotes;
|
||||||
@@ -312,7 +312,7 @@
|
|||||||
CODE_SIGN_IDENTITY = "Apple Development";
|
CODE_SIGN_IDENTITY = "Apple Development";
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
COMBINE_HIDPI_IMAGES = YES;
|
COMBINE_HIDPI_IMAGES = YES;
|
||||||
CURRENT_PROJECT_VERSION = 43;
|
CURRENT_PROJECT_VERSION = 45;
|
||||||
DEVELOPMENT_ASSET_PATHS = "\"meetingnotes/Preview Content\"";
|
DEVELOPMENT_ASSET_PATHS = "\"meetingnotes/Preview Content\"";
|
||||||
DEVELOPMENT_TEAM = G9LVHZAJNX;
|
DEVELOPMENT_TEAM = G9LVHZAJNX;
|
||||||
ENABLE_HARDENED_RUNTIME = YES;
|
ENABLE_HARDENED_RUNTIME = YES;
|
||||||
@@ -326,7 +326,7 @@
|
|||||||
"@executable_path/../Frameworks",
|
"@executable_path/../Frameworks",
|
||||||
);
|
);
|
||||||
MACOSX_DEPLOYMENT_TARGET = 15.0;
|
MACOSX_DEPLOYMENT_TARGET = 15.0;
|
||||||
MARKETING_VERSION = 1.1.31;
|
MARKETING_VERSION = 1.1.33;
|
||||||
ONLY_ACTIVE_ARCH = YES;
|
ONLY_ACTIVE_ARCH = YES;
|
||||||
OTHER_SWIFT_FLAGS = "$(inherited) -D ENABLE_TCC_SPI";
|
OTHER_SWIFT_FLAGS = "$(inherited) -D ENABLE_TCC_SPI";
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = net.jamesbone.meetingnotes;
|
PRODUCT_BUNDLE_IDENTIFIER = net.jamesbone.meetingnotes;
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ Later:
|
|||||||
## Releasing a New Version
|
## Releasing a New Version
|
||||||
|
|
||||||
Production releases are Developer ID signed, notarized by Apple, published to
|
Production releases are Developer ID signed, notarized by Apple, published to
|
||||||
GitHub Releases, and signed for Sparkle auto-updates.
|
[Gitea Releases](https://git.jamesbone.net/coder/meetingnotes/releases), and signed for Sparkle auto-updates.
|
||||||
|
|
||||||
### Release Process
|
### Release Process
|
||||||
|
|
||||||
@@ -68,12 +68,12 @@ GitHub Releases, and signed for Sparkle auto-updates.
|
|||||||
|
|
||||||
2. Commit and push the version change to `main`.
|
2. Commit and push the version change to `main`.
|
||||||
|
|
||||||
3. Run the `Release` workflow from GitHub Actions and enter the version without
|
3. Run the `Release` workflow from Gitea Actions on `main` and enter the version without
|
||||||
the `v` prefix. The workflow signs and notarizes the app, generates the
|
the `v` prefix. The workflow signs and notarizes the app, generates the
|
||||||
signed appcast, creates the version tag, and publishes both release assets.
|
signed appcast, creates the version tag, and publishes both release assets.
|
||||||
|
|
||||||
The app checks
|
The app checks
|
||||||
`https://github.com/superdooper86/meetingnotes/releases/latest/download/appcast.xml`
|
`https://git.jamesbone.net/coder/meetingnotes/releases/download/latest/appcast.xml`
|
||||||
and installs later releases automatically through Sparkle.
|
and installs later releases automatically through Sparkle.
|
||||||
|
|
||||||
### Recovering Meetings
|
### Recovering Meetings
|
||||||
@@ -82,3 +82,20 @@ The first Developer ID signed build may not automatically inherit data from an
|
|||||||
older ad-hoc signed build. In Settings, use **Import Meetings...** and select the
|
older ad-hoc signed build. In Settings, use **Import Meetings...** and select the
|
||||||
old `Meetings` folder. After this one-time transition, the stable signing
|
old `Meetings` folder. After this one-time transition, the stable signing
|
||||||
identity keeps the same sandbox container across updates.
|
identity keeps the same sandbox container across updates.
|
||||||
|
|
||||||
|
### Build runner and GitHub transition
|
||||||
|
|
||||||
|
`.gitea/workflows/build.yml` builds universal macOS artifacts for pushes and pull
|
||||||
|
requests to `main`. The shared account-scoped `mac-mini` runner uses the
|
||||||
|
`macos-arm64` label. Smoke tests use a separate CI bundle identifier and temporary
|
||||||
|
launch preferences and an internal-volume staging directory. Keychain services
|
||||||
|
follow the bundle identifier, so CI never reads production credentials; the smoke
|
||||||
|
test removes its isolated API token before and after each launch. Release jobs import the original Developer ID certificate
|
||||||
|
into a temporary keychain and keep the original Sparkle signing key in Gitea
|
||||||
|
Actions secrets. They never publish from a development branch.
|
||||||
|
|
||||||
|
Version 1.1.33 moves the embedded update feed to Gitea. After its notarized archive
|
||||||
|
is verified, replace the `appcast.xml` asset on the last GitHub release with the
|
||||||
|
new appcast. Existing installations discover the Gitea download through that old
|
||||||
|
GitHub feed; after installing it, they check Gitea directly. Keep the old GitHub
|
||||||
|
repository and its release appcast available for installations that update later.
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
<key>NSMicrophoneUsageDescription</key>
|
<key>NSMicrophoneUsageDescription</key>
|
||||||
<string>Meetingnotes needs access to your microphone for transcription.</string>
|
<string>Meetingnotes needs access to your microphone for transcription.</string>
|
||||||
<key>SUFeedURL</key>
|
<key>SUFeedURL</key>
|
||||||
<string>https://github.com/superdooper86/meetingnotes/releases/latest/download/appcast.xml</string>
|
<string>https://git.jamesbone.net/coder/meetingnotes/releases/download/latest/appcast.xml</string>
|
||||||
<key>SUPublicEDKey</key>
|
<key>SUPublicEDKey</key>
|
||||||
<string>9ZuN9G9ERB3Qoyyd/4FsF+6LMUv5jzAGP26OXAHBiW0=</string>
|
<string>9ZuN9G9ERB3Qoyyd/4FsF+6LMUv5jzAGP26OXAHBiW0=</string>
|
||||||
<key>SUEnableAutomaticChecks</key>
|
<key>SUEnableAutomaticChecks</key>
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ final class AudioManager: NSObject, ObservableObject {
|
|||||||
private var recordingStartedAt = Date()
|
private var recordingStartedAt = Date()
|
||||||
private var systemDiagnostics = SystemCaptureDiagnostics()
|
private var systemDiagnostics = SystemCaptureDiagnostics()
|
||||||
|
|
||||||
private override init() {
|
override init() {
|
||||||
super.init()
|
super.init()
|
||||||
observeAudioEngine()
|
observeAudioEngine()
|
||||||
}
|
}
|
||||||
@@ -460,7 +460,8 @@ final class AudioManager: NSObject, ObservableObject {
|
|||||||
}
|
}
|
||||||
|
|
||||||
guard let previousBuffer = pendingBuffer,
|
guard let previousBuffer = pendingBuffer,
|
||||||
let previousInputTime = pendingInputTime else {
|
let previousInputTime = pendingInputTime,
|
||||||
|
let previousNow = pendingNow else {
|
||||||
pendingBuffer = currentBuffer
|
pendingBuffer = currentBuffer
|
||||||
pendingInputTime = inInputTime.pointee
|
pendingInputTime = inInputTime.pointee
|
||||||
pendingNow = inNow.pointee
|
pendingNow = inNow.pointee
|
||||||
@@ -471,7 +472,9 @@ final class AudioManager: NSObject, ObservableObject {
|
|||||||
advertisedSampleRate: advertisedInputFormat.sampleRate,
|
advertisedSampleRate: advertisedInputFormat.sampleRate,
|
||||||
previousFrameLength: previousBuffer.frameLength,
|
previousFrameLength: previousBuffer.frameLength,
|
||||||
previousTimestamp: previousInputTime,
|
previousTimestamp: previousInputTime,
|
||||||
currentTimestamp: inInputTime.pointee
|
currentTimestamp: inInputTime.pointee,
|
||||||
|
previousHostTimestamp: previousNow,
|
||||||
|
currentHostTimestamp: inNow.pointee
|
||||||
)
|
)
|
||||||
inputFormat = self.inputFormat(
|
inputFormat = self.inputFormat(
|
||||||
for: inputData,
|
for: inputData,
|
||||||
@@ -552,27 +555,35 @@ final class AudioManager: NSObject, ObservableObject {
|
|||||||
advertisedSampleRate: Double,
|
advertisedSampleRate: Double,
|
||||||
previousFrameLength: AVAudioFrameCount,
|
previousFrameLength: AVAudioFrameCount,
|
||||||
previousTimestamp: AudioTimeStamp,
|
previousTimestamp: AudioTimeStamp,
|
||||||
currentTimestamp: AudioTimeStamp
|
currentTimestamp: AudioTimeStamp,
|
||||||
|
previousHostTimestamp: AudioTimeStamp,
|
||||||
|
currentHostTimestamp: AudioTimeStamp
|
||||||
) -> Double {
|
) -> Double {
|
||||||
let timestampsAreValid = previousTimestamp.mFlags.contains(.sampleTimeValid)
|
|
||||||
&& currentTimestamp.mFlags.contains(.sampleTimeValid)
|
|
||||||
let sampleTimeDelta = currentTimestamp.mSampleTime - previousTimestamp.mSampleTime
|
let sampleTimeDelta = currentTimestamp.mSampleTime - previousTimestamp.mSampleTime
|
||||||
guard timestampsAreValid,
|
guard advertisedSampleRate > 0, previousFrameLength > 0 else {
|
||||||
advertisedSampleRate > 0,
|
systemDiagnostics.inputRateInference = "advertised (invalid advertised rate or frame count)"
|
||||||
previousFrameLength > 0,
|
|
||||||
sampleTimeDelta.isFinite,
|
|
||||||
sampleTimeDelta > 0 else {
|
|
||||||
systemDiagnostics.inputRateInference = "advertised (sample timestamps unavailable)"
|
|
||||||
return advertisedSampleRate
|
return advertisedSampleRate
|
||||||
}
|
}
|
||||||
|
|
||||||
let inferredSampleRate = advertisedSampleRate * Double(previousFrameLength) / sampleTimeDelta
|
guard currentHostTimestamp.mHostTime > previousHostTimestamp.mHostTime else {
|
||||||
|
systemDiagnostics.inputRateInference = "advertised (host timestamps unavailable)"
|
||||||
|
return advertisedSampleRate
|
||||||
|
}
|
||||||
|
let hostTimeDelta = currentHostTimestamp.mHostTime - previousHostTimestamp.mHostTime
|
||||||
|
let hostNanoseconds = AudioConvertHostTimeToNanos(hostTimeDelta)
|
||||||
|
guard hostNanoseconds > 0 else {
|
||||||
|
systemDiagnostics.inputRateInference = "advertised (host-time conversion failed)"
|
||||||
|
return advertisedSampleRate
|
||||||
|
}
|
||||||
|
|
||||||
|
let inferredSampleRate = Double(previousFrameLength) * 1_000_000_000 / Double(hostNanoseconds)
|
||||||
let plausibleRange = (advertisedSampleRate * 0.25)...(advertisedSampleRate * 1.25)
|
let plausibleRange = (advertisedSampleRate * 0.25)...(advertisedSampleRate * 1.25)
|
||||||
guard inferredSampleRate.isFinite, plausibleRange.contains(inferredSampleRate) else {
|
guard inferredSampleRate.isFinite, plausibleRange.contains(inferredSampleRate) else {
|
||||||
systemDiagnostics.inputRateInference = String(
|
systemDiagnostics.inputRateInference = String(
|
||||||
format: "advertised (invalid inference %.3f from %u frames / %.3f sample-time units)",
|
format: "advertised (invalid host inference %.3f from %u frames / %llu ns; sampleTimeDelta=%.3f)",
|
||||||
inferredSampleRate,
|
inferredSampleRate,
|
||||||
previousFrameLength,
|
previousFrameLength,
|
||||||
|
hostNanoseconds,
|
||||||
sampleTimeDelta
|
sampleTimeDelta
|
||||||
)
|
)
|
||||||
return advertisedSampleRate
|
return advertisedSampleRate
|
||||||
@@ -584,11 +595,12 @@ final class AudioManager: NSObject, ObservableObject {
|
|||||||
.flatMap { abs($0 - inferredSampleRate) / $0 <= 0.01 ? $0 : nil }
|
.flatMap { abs($0 - inferredSampleRate) / $0 <= 0.01 ? $0 : nil }
|
||||||
?? inferredSampleRate
|
?? inferredSampleRate
|
||||||
systemDiagnostics.inputRateInference = String(
|
systemDiagnostics.inputRateInference = String(
|
||||||
format: "advertised=%.3f,inferred=%.3f,selected=%.3f,previousFrames=%u,sampleTimeDelta=%.3f",
|
format: "source=hostTime,advertised=%.3f,inferred=%.3f,selected=%.3f,previousFrames=%u,hostNanoseconds=%llu,sampleTimeDelta=%.3f",
|
||||||
advertisedSampleRate,
|
advertisedSampleRate,
|
||||||
inferredSampleRate,
|
inferredSampleRate,
|
||||||
selectedSampleRate,
|
selectedSampleRate,
|
||||||
previousFrameLength,
|
previousFrameLength,
|
||||||
|
hostNanoseconds,
|
||||||
sampleTimeDelta
|
sampleTimeDelta
|
||||||
)
|
)
|
||||||
return selectedSampleRate
|
return selectedSampleRate
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import Security
|
|||||||
class KeychainHelper {
|
class KeychainHelper {
|
||||||
static let shared = KeychainHelper()
|
static let shared = KeychainHelper()
|
||||||
|
|
||||||
private let serviceName = "net.jamesbone.meetingnotes"
|
private let serviceName = Bundle.main.bundleIdentifier ?? "net.jamesbone.meetingnotes"
|
||||||
|
|
||||||
private init() {}
|
private init() {}
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,12 @@ import Foundation
|
|||||||
import SwiftUI
|
import SwiftUI
|
||||||
import Combine
|
import Combine
|
||||||
|
|
||||||
|
struct RecordingCompletion {
|
||||||
|
let chunks: [TranscriptChunk]
|
||||||
|
let recoveryAudioFolderName: String?
|
||||||
|
let transcriptionError: String?
|
||||||
|
}
|
||||||
|
|
||||||
/// Manages recording sessions at the app level to persist across navigation
|
/// Manages recording sessions at the app level to persist across navigation
|
||||||
@MainActor
|
@MainActor
|
||||||
class RecordingSessionManager: ObservableObject {
|
class RecordingSessionManager: ObservableObject {
|
||||||
@@ -14,9 +20,11 @@ class RecordingSessionManager: ObservableObject {
|
|||||||
@Published var errorMessage: String?
|
@Published var errorMessage: String?
|
||||||
@Published var activeRecordingTranscriptChunksUpdated: [TranscriptChunk] = []
|
@Published var activeRecordingTranscriptChunksUpdated: [TranscriptChunk] = []
|
||||||
|
|
||||||
private let audioManager = AudioManager.shared
|
private var audioManager = AudioManager.shared
|
||||||
private var cancellables = Set<AnyCancellable>()
|
private var cancellables = Set<AnyCancellable>()
|
||||||
|
private var audioManagerCancellables = Set<AnyCancellable>()
|
||||||
private let transcriptUpdateSubject = PassthroughSubject<[TranscriptChunk], Never>()
|
private let transcriptUpdateSubject = PassthroughSubject<[TranscriptChunk], Never>()
|
||||||
|
private var processingMeetingIds = Set<UUID>()
|
||||||
|
|
||||||
// Store transcript chunks for the active recording session
|
// Store transcript chunks for the active recording session
|
||||||
private var activeRecordingTranscriptChunks: [TranscriptChunk] = []
|
private var activeRecordingTranscriptChunks: [TranscriptChunk] = []
|
||||||
@@ -27,24 +35,19 @@ class RecordingSessionManager: ObservableObject {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private func setupAudioManagerBindings() {
|
private func setupAudioManagerBindings() {
|
||||||
|
audioManagerCancellables.removeAll()
|
||||||
// Bind to audio manager state
|
// Bind to audio manager state
|
||||||
audioManager.$isRecording
|
audioManager.$isRecording
|
||||||
.sink { [weak self] isRecording in
|
.sink { [weak self] isRecording in
|
||||||
self?.isRecording = isRecording
|
self?.isRecording = isRecording
|
||||||
}
|
}
|
||||||
.store(in: &cancellables)
|
.store(in: &audioManagerCancellables)
|
||||||
|
|
||||||
audioManager.$isProcessing
|
|
||||||
.sink { [weak self] isProcessing in
|
|
||||||
self?.isProcessing = isProcessing
|
|
||||||
}
|
|
||||||
.store(in: &cancellables)
|
|
||||||
|
|
||||||
audioManager.$errorMessage
|
audioManager.$errorMessage
|
||||||
.sink { [weak self] errorMessage in
|
.sink { [weak self] errorMessage in
|
||||||
self?.errorMessage = errorMessage
|
self?.errorMessage = errorMessage
|
||||||
}
|
}
|
||||||
.store(in: &cancellables)
|
.store(in: &audioManagerCancellables)
|
||||||
|
|
||||||
// When transcript chunks change, store them for the active recording and send to debouncer
|
// When transcript chunks change, store them for the active recording and send to debouncer
|
||||||
audioManager.$transcriptChunks
|
audioManager.$transcriptChunks
|
||||||
@@ -55,7 +58,7 @@ class RecordingSessionManager: ObservableObject {
|
|||||||
|
|
||||||
self.transcriptUpdateSubject.send(newChunks)
|
self.transcriptUpdateSubject.send(newChunks)
|
||||||
}
|
}
|
||||||
.store(in: &cancellables)
|
.store(in: &audioManagerCancellables)
|
||||||
}
|
}
|
||||||
|
|
||||||
private func setupDebouncedSaving() {
|
private func setupDebouncedSaving() {
|
||||||
@@ -84,26 +87,40 @@ class RecordingSessionManager: ObservableObject {
|
|||||||
audioManager.startRecording(for: meetingId)
|
audioManager.startRecording(for: meetingId)
|
||||||
}
|
}
|
||||||
|
|
||||||
func stopRecording() async -> [TranscriptChunk] {
|
func stopRecording() async -> RecordingCompletion {
|
||||||
print("🛑 Stopping recording for meeting: \(activeMeetingId?.uuidString ?? "unknown")")
|
print("🛑 Stopping recording for meeting: \(activeMeetingId?.uuidString ?? "unknown")")
|
||||||
|
|
||||||
guard let meetingId = activeMeetingId else {
|
guard let meetingId = activeMeetingId else {
|
||||||
audioManager.cancelRecording()
|
audioManager.cancelRecording()
|
||||||
recordingStartedAt = nil
|
recordingStartedAt = nil
|
||||||
return []
|
return RecordingCompletion(chunks: [], recoveryAudioFolderName: nil, transcriptionError: nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let completedAudioManager = audioManager
|
||||||
|
audioManager = AudioManager()
|
||||||
|
setupAudioManagerBindings()
|
||||||
|
activeMeetingId = nil
|
||||||
recordingStartedAt = nil
|
recordingStartedAt = nil
|
||||||
let chunks = await audioManager.stopRecordingAndTranscribe()
|
processingMeetingIds.insert(meetingId)
|
||||||
activeRecordingTranscriptChunks = chunks
|
isProcessing = true
|
||||||
activeRecordingTranscriptChunksUpdated = chunks
|
defer {
|
||||||
|
processingMeetingIds.remove(meetingId)
|
||||||
|
isProcessing = !processingMeetingIds.isEmpty
|
||||||
|
}
|
||||||
|
|
||||||
|
let chunks = await completedAudioManager.stopRecordingAndTranscribe()
|
||||||
|
let completion = RecordingCompletion(
|
||||||
|
chunks: chunks,
|
||||||
|
recoveryAudioFolderName: completedAudioManager.lastRecoveryAudioFolderName,
|
||||||
|
transcriptionError: completedAudioManager.errorMessage
|
||||||
|
)
|
||||||
updateActiveMeetingTranscript(
|
updateActiveMeetingTranscript(
|
||||||
meetingId: meetingId,
|
meetingId: meetingId,
|
||||||
chunks: chunks,
|
chunks: chunks,
|
||||||
transcriptionError: audioManager.errorMessage
|
recoveryAudioFolderName: completion.recoveryAudioFolderName,
|
||||||
|
transcriptionError: completion.transcriptionError
|
||||||
)
|
)
|
||||||
activeMeetingId = nil
|
return completion
|
||||||
activeRecordingTranscriptChunks = []
|
|
||||||
return chunks
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func cancelRecording() {
|
func cancelRecording() {
|
||||||
@@ -117,13 +134,14 @@ class RecordingSessionManager: ObservableObject {
|
|||||||
return isRecording && activeMeetingId == meetingId
|
return isRecording && activeMeetingId == meetingId
|
||||||
}
|
}
|
||||||
|
|
||||||
var lastRecoveryAudioFolderName: String? {
|
func isProcessingMeeting(_ meetingId: UUID) -> Bool {
|
||||||
audioManager.lastRecoveryAudioFolderName
|
processingMeetingIds.contains(meetingId)
|
||||||
}
|
}
|
||||||
|
|
||||||
private func updateActiveMeetingTranscript(
|
private func updateActiveMeetingTranscript(
|
||||||
meetingId: UUID,
|
meetingId: UUID,
|
||||||
chunks: [TranscriptChunk],
|
chunks: [TranscriptChunk],
|
||||||
|
recoveryAudioFolderName: String? = nil,
|
||||||
transcriptionError: String? = nil
|
transcriptionError: String? = nil
|
||||||
) {
|
) {
|
||||||
// Load all meetings
|
// Load all meetings
|
||||||
@@ -132,7 +150,7 @@ class RecordingSessionManager: ObservableObject {
|
|||||||
// Find and update the active meeting
|
// Find and update the active meeting
|
||||||
if let index = meetings.firstIndex(where: { $0.id == meetingId }) {
|
if let index = meetings.firstIndex(where: { $0.id == meetingId }) {
|
||||||
meetings[index].transcriptChunks = chunks
|
meetings[index].transcriptChunks = chunks
|
||||||
if let recoveryAudioFolderName = lastRecoveryAudioFolderName {
|
if let recoveryAudioFolderName {
|
||||||
meetings[index].recoveryAudioFolderName = recoveryAudioFolderName
|
meetings[index].recoveryAudioFolderName = recoveryAudioFolderName
|
||||||
}
|
}
|
||||||
meetings[index].transcriptionError = transcriptionError
|
meetings[index].transcriptionError = transcriptionError
|
||||||
|
|||||||
@@ -182,13 +182,13 @@ private enum LocalAPIRouter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private enum LocalRecordingError: LocalizedError {
|
private enum LocalRecordingError: LocalizedError {
|
||||||
case processing
|
case stopping
|
||||||
case saveFailed
|
case saveFailed
|
||||||
|
|
||||||
var errorDescription: String? {
|
var errorDescription: String? {
|
||||||
switch self {
|
switch self {
|
||||||
case .processing:
|
case .stopping:
|
||||||
return "The previous meeting is still processing."
|
return "The current recording is still stopping."
|
||||||
case .saveFailed:
|
case .saveFailed:
|
||||||
return "Could not create a meeting for this recording."
|
return "Could not create a meeting for this recording."
|
||||||
}
|
}
|
||||||
@@ -208,12 +208,12 @@ private final class LocalRecordingController {
|
|||||||
|
|
||||||
func statusPayload() -> [String: Any] {
|
func statusPayload() -> [String: Any] {
|
||||||
let state: String
|
let state: String
|
||||||
if isStopping || recordingManager.isProcessing {
|
if recordingManager.isRecording {
|
||||||
state = "processing"
|
|
||||||
} else if recordingManager.isRecording {
|
|
||||||
state = "recording"
|
state = "recording"
|
||||||
} else if recordingManager.activeMeetingId != nil {
|
} else if recordingManager.activeMeetingId != nil {
|
||||||
state = "starting"
|
state = "starting"
|
||||||
|
} else if isStopping || recordingManager.isProcessing {
|
||||||
|
state = "processing"
|
||||||
} else {
|
} else {
|
||||||
state = "idle"
|
state = "idle"
|
||||||
}
|
}
|
||||||
@@ -245,8 +245,8 @@ private final class LocalRecordingController {
|
|||||||
isStopping = false
|
isStopping = false
|
||||||
return statusPayload()
|
return statusPayload()
|
||||||
}
|
}
|
||||||
if isStopping || recordingManager.isProcessing {
|
if isStopping {
|
||||||
throw LocalRecordingError.processing
|
throw LocalRecordingError.stopping
|
||||||
}
|
}
|
||||||
if recordingManager.activeMeetingId != nil {
|
if recordingManager.activeMeetingId != nil {
|
||||||
return statusPayload()
|
return statusPayload()
|
||||||
@@ -295,15 +295,16 @@ private final class LocalRecordingController {
|
|||||||
private func finishRecording() async {
|
private func finishRecording() async {
|
||||||
pendingStopTask = nil
|
pendingStopTask = nil
|
||||||
let meetingID = recordingManager.activeMeetingId
|
let meetingID = recordingManager.activeMeetingId
|
||||||
let chunks = await recordingManager.stopRecording()
|
isStopping = false
|
||||||
|
let completion = await recordingManager.stopRecording()
|
||||||
guard let meetingID,
|
guard let meetingID,
|
||||||
var meeting = LocalStorageManager.shared.loadMeetings().first(where: { $0.id == meetingID }) else {
|
var meeting = LocalStorageManager.shared.loadMeetings().first(where: { $0.id == meetingID }) else {
|
||||||
isStopping = false
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
meeting.transcriptChunks = chunks
|
meeting.transcriptChunks = completion.chunks
|
||||||
meeting.recoveryAudioFolderName = recordingManager.lastRecoveryAudioFolderName
|
meeting.recoveryAudioFolderName = completion.recoveryAudioFolderName
|
||||||
|
meeting.transcriptionError = completion.transcriptionError
|
||||||
let templates = LocalStorageManager.shared.loadTemplates()
|
let templates = LocalStorageManager.shared.loadTemplates()
|
||||||
if meeting.templateId == nil {
|
if meeting.templateId == nil {
|
||||||
meeting.templateId = LocalStorageManager.shared.preferredTemplateID(in: templates)
|
meeting.templateId = LocalStorageManager.shared.preferredTemplateID(in: templates)
|
||||||
@@ -352,7 +353,6 @@ private final class LocalRecordingController {
|
|||||||
NotificationCenter.default.post(name: .meetingSaved, object: meeting)
|
NotificationCenter.default.post(name: .meetingSaved, object: meeting)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
isStopping = false
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ class MeetingViewModel: ObservableObject {
|
|||||||
|
|
||||||
var isProcessing: Bool {
|
var isProcessing: Bool {
|
||||||
return isRetryingTranscription ||
|
return isRetryingTranscription ||
|
||||||
(recordingSessionManager.isProcessing && recordingSessionManager.activeMeetingId == meeting.id)
|
recordingSessionManager.isProcessingMeeting(meeting.id)
|
||||||
}
|
}
|
||||||
|
|
||||||
var canRetryTranscription: Bool {
|
var canRetryTranscription: Bool {
|
||||||
@@ -137,13 +137,11 @@ class MeetingViewModel: ObservableObject {
|
|||||||
self.meeting.transcriptChunks = recordingSessionManager.getTranscriptChunks(for: meeting.id)
|
self.meeting.transcriptChunks = recordingSessionManager.getTranscriptChunks(for: meeting.id)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Listen for final transcript updates for this meeting.
|
// Listen for transcript updates emitted while this meeting is recording.
|
||||||
recordingSessionManager.$activeRecordingTranscriptChunksUpdated
|
recordingSessionManager.$activeRecordingTranscriptChunksUpdated
|
||||||
.dropFirst()
|
.dropFirst()
|
||||||
.sink { [weak self] updatedChunks in
|
.sink { [weak self] updatedChunks in
|
||||||
guard let self = self else { return }
|
guard let self = self else { return }
|
||||||
// Stop publishes the final chunks after capture has ended but
|
|
||||||
// before the active meeting is cleared.
|
|
||||||
if recordingSessionManager.activeMeetingId == self.meeting.id {
|
if recordingSessionManager.activeMeetingId == self.meeting.id {
|
||||||
self.meeting.transcriptChunks = updatedChunks
|
self.meeting.transcriptChunks = updatedChunks
|
||||||
}
|
}
|
||||||
@@ -223,10 +221,11 @@ class MeetingViewModel: ObservableObject {
|
|||||||
func stopRecording() {
|
func stopRecording() {
|
||||||
isStartingRecording = true
|
isStartingRecording = true
|
||||||
Task {
|
Task {
|
||||||
let chunks = await recordingSessionManager.stopRecording()
|
let completion = await recordingSessionManager.stopRecording()
|
||||||
meeting.transcriptChunks = chunks
|
meeting.transcriptChunks = completion.chunks
|
||||||
meeting.recoveryAudioFolderName = recordingSessionManager.lastRecoveryAudioFolderName
|
meeting.recoveryAudioFolderName = completion.recoveryAudioFolderName
|
||||||
meeting.transcriptionError = recordingSessionManager.errorMessage
|
meeting.transcriptionError = completion.transcriptionError
|
||||||
|
errorMessage = completion.transcriptionError
|
||||||
refreshRecoveryAudioFolder()
|
refreshRecoveryAudioFolder()
|
||||||
saveMeeting()
|
saveMeeting()
|
||||||
if !meeting.formattedTranscript.isEmpty {
|
if !meeting.formattedTranscript.isEmpty {
|
||||||
|
|||||||
@@ -255,7 +255,7 @@ struct SettingsView: View {
|
|||||||
|
|
||||||
// Link to GitHub repository
|
// Link to GitHub repository
|
||||||
Link("GitHub",
|
Link("GitHub",
|
||||||
destination: URL(string: "https://github.com/superdooper86/meetingnotes")!)
|
destination: URL(string: "https://git.jamesbone.net/coder/meetingnotes")!)
|
||||||
.foregroundColor(.blue)
|
.foregroundColor(.blue)
|
||||||
|
|
||||||
// Link to landing page
|
// Link to landing page
|
||||||
|
|||||||
@@ -1,34 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
REPOSITORY="${REPOSITORY:-superdooper86/meetingnotes}"
|
|
||||||
|
|
||||||
if ! command -v gh >/dev/null 2>&1; then
|
|
||||||
echo "Install GitHub CLI first: brew install gh" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
gh auth status >/dev/null
|
|
||||||
|
|
||||||
read -r -p "Developer ID certificate (.p12) path: " certificate_path
|
|
||||||
if [[ ! -f "$certificate_path" ]]; then
|
|
||||||
echo "Certificate not found: $certificate_path" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
read -r -s -p "Certificate export password: " certificate_password
|
|
||||||
printf '\n'
|
|
||||||
read -r -p "Apple ID email: " apple_id
|
|
||||||
read -r -p "Apple Developer Team ID: " team_id
|
|
||||||
read -r -s -p "Apple app-specific password: " app_password
|
|
||||||
printf '\n'
|
|
||||||
|
|
||||||
base64 < "$certificate_path" | gh secret set APPLE_CERTIFICATE_P12 -R "$REPOSITORY"
|
|
||||||
printf '%s' "$certificate_password" | gh secret set APPLE_CERTIFICATE_PASSWORD -R "$REPOSITORY"
|
|
||||||
printf '%s' "$apple_id" | gh secret set APPLE_ID -R "$REPOSITORY"
|
|
||||||
printf '%s' "$team_id" | gh secret set APPLE_TEAM_ID -R "$REPOSITORY"
|
|
||||||
printf '%s' "$app_password" | gh secret set APPLE_APP_PASSWORD -R "$REPOSITORY"
|
|
||||||
|
|
||||||
unset certificate_password app_password
|
|
||||||
echo "Apple release secrets configured for $REPOSITORY."
|
|
||||||
@@ -1,139 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
APP_NAME="Meetingnotes"
|
|
||||||
RUNNER_TEMP="${RUNNER_TEMP:-/tmp}"
|
|
||||||
PENDING_DIR="${PENDING_DIR:-$RUNNER_TEMP/meetingnotes-pending}"
|
|
||||||
WORK_ROOT="${WORK_ROOT:-$RUNNER_TEMP/meetingnotes-finalize}"
|
|
||||||
APP_PATH="$WORK_ROOT/$APP_NAME.app"
|
|
||||||
RELEASE_DIR="$WORK_ROOT/release"
|
|
||||||
VERSION_PATH="$PENDING_DIR/version"
|
|
||||||
COMMIT_SHA_PATH="$PENDING_DIR/commit-sha"
|
|
||||||
SUBMISSION_PATH="$PENDING_DIR/notary-submission.json"
|
|
||||||
PRE_NOTARY_ZIP="$PENDING_DIR/$APP_NAME-pre-notary.zip"
|
|
||||||
|
|
||||||
required_variables=(
|
|
||||||
APPLE_ID
|
|
||||||
APPLE_TEAM_ID
|
|
||||||
APPLE_APP_PASSWORD
|
|
||||||
SPARKLE_PRIVATE_KEY
|
|
||||||
GH_TOKEN
|
|
||||||
GITHUB_REPOSITORY
|
|
||||||
)
|
|
||||||
|
|
||||||
for variable in "${required_variables[@]}"; do
|
|
||||||
if [[ -z "${!variable:-}" ]]; then
|
|
||||||
echo "Missing required environment variable: $variable" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
for path in "$VERSION_PATH" "$COMMIT_SHA_PATH" "$SUBMISSION_PATH" "$PRE_NOTARY_ZIP" "$PENDING_DIR/generate_appcast"; do
|
|
||||||
if [[ ! -e "$path" ]]; then
|
|
||||||
echo "Missing release submission artifact: $path" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
VERSION=$(<"$VERSION_PATH")
|
|
||||||
COMMIT_SHA=$(<"$COMMIT_SHA_PATH")
|
|
||||||
SUBMISSION_ID=$(plutil -extract id raw -o - "$SUBMISSION_PATH")
|
|
||||||
TAG="v$VERSION"
|
|
||||||
|
|
||||||
if gh release view "$TAG" --repo "$GITHUB_REPOSITORY" >/dev/null 2>&1; then
|
|
||||||
echo "Release already exists: $TAG"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
STATUS_PATH="$WORK_ROOT/notary-status.json"
|
|
||||||
rm -rf "$WORK_ROOT"
|
|
||||||
mkdir -p "$RELEASE_DIR"
|
|
||||||
|
|
||||||
notary_info_succeeded=false
|
|
||||||
for attempt in 1 2 3; do
|
|
||||||
if xcrun notarytool info "$SUBMISSION_ID" \
|
|
||||||
--apple-id "$APPLE_ID" \
|
|
||||||
--team-id "$APPLE_TEAM_ID" \
|
|
||||||
--password "$APPLE_APP_PASSWORD" \
|
|
||||||
--output-format json > "$STATUS_PATH"; then
|
|
||||||
notary_info_succeeded=true
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
echo "Notary status check failed ($attempt/3); retrying"
|
|
||||||
sleep 15
|
|
||||||
done
|
|
||||||
|
|
||||||
if [[ "$notary_info_succeeded" != true ]]; then
|
|
||||||
echo "Unable to query Apple notarization status after three attempts" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
NOTARY_STATUS=$(plutil -extract status raw -o - "$STATUS_PATH")
|
|
||||||
echo "Notarization status for $SUBMISSION_ID: $NOTARY_STATUS"
|
|
||||||
|
|
||||||
case "$NOTARY_STATUS" in
|
|
||||||
"In Progress")
|
|
||||||
if [[ -n "${GITHUB_STEP_SUMMARY:-}" ]]; then
|
|
||||||
printf 'Apple is still processing Meetingnotes %s. Submission: `%s`. The scheduled workflow will check again.\n' \
|
|
||||||
"$VERSION" "$SUBMISSION_ID" >> "$GITHUB_STEP_SUMMARY"
|
|
||||||
fi
|
|
||||||
exit 0
|
|
||||||
;;
|
|
||||||
Accepted)
|
|
||||||
;;
|
|
||||||
Invalid|Rejected)
|
|
||||||
xcrun notarytool log "$SUBMISSION_ID" \
|
|
||||||
--apple-id "$APPLE_ID" \
|
|
||||||
--team-id "$APPLE_TEAM_ID" \
|
|
||||||
--password "$APPLE_APP_PASSWORD" || true
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "Unexpected notarization status: $NOTARY_STATUS" >&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
ditto -x -k "$PRE_NOTARY_ZIP" "$WORK_ROOT"
|
|
||||||
if [[ ! -d "$APP_PATH" ]]; then
|
|
||||||
echo "Signed app was not found after extracting $PRE_NOTARY_ZIP" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
APP_VERSION=$(plutil -extract CFBundleShortVersionString raw -o - "$APP_PATH/Contents/Info.plist")
|
|
||||||
if [[ "$APP_VERSION" != "$VERSION" ]]; then
|
|
||||||
echo "Signed app version $APP_VERSION does not match release version $VERSION" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
xcrun stapler staple "$APP_PATH"
|
|
||||||
xcrun stapler validate "$APP_PATH"
|
|
||||||
spctl --assess --type execute --verbose=2 "$APP_PATH"
|
|
||||||
|
|
||||||
ARCHIVE_NAME="$APP_NAME-$VERSION.zip"
|
|
||||||
ARCHIVE_PATH="$RELEASE_DIR/$ARCHIVE_NAME"
|
|
||||||
ditto -c -k --sequesterRsrc --keepParent "$APP_PATH" "$ARCHIVE_PATH"
|
|
||||||
|
|
||||||
GENERATE_APPCAST="$PENDING_DIR/generate_appcast"
|
|
||||||
chmod +x "$GENERATE_APPCAST"
|
|
||||||
DOWNLOAD_URL="https://github.com/$GITHUB_REPOSITORY/releases/download/$TAG/"
|
|
||||||
printf '%s' "$SPARKLE_PRIVATE_KEY" | "$GENERATE_APPCAST" "$RELEASE_DIR" \
|
|
||||||
--ed-key-file - \
|
|
||||||
--download-url-prefix "$DOWNLOAD_URL" \
|
|
||||||
--maximum-deltas 0 \
|
|
||||||
-o "$RELEASE_DIR/appcast.xml"
|
|
||||||
|
|
||||||
grep -q "$DOWNLOAD_URL$ARCHIVE_NAME" "$RELEASE_DIR/appcast.xml"
|
|
||||||
grep -q 'sparkle:edSignature=' "$RELEASE_DIR/appcast.xml"
|
|
||||||
|
|
||||||
gh release \
|
|
||||||
create "$TAG" \
|
|
||||||
"$ARCHIVE_PATH" \
|
|
||||||
"$RELEASE_DIR/appcast.xml" \
|
|
||||||
--repo "$GITHUB_REPOSITORY" \
|
|
||||||
--target "$COMMIT_SHA" \
|
|
||||||
--title "Meetingnotes $VERSION" \
|
|
||||||
--generate-notes
|
|
||||||
|
|
||||||
echo "Published Meetingnotes $VERSION"
|
|
||||||
@@ -14,11 +14,13 @@ APP_PATH="$DERIVED_DATA/Build/Products/Release/$APP_NAME.app"
|
|||||||
required_variables=(
|
required_variables=(
|
||||||
VERSION
|
VERSION
|
||||||
SIGNING_IDENTITY
|
SIGNING_IDENTITY
|
||||||
|
SIGNING_KEYCHAIN
|
||||||
APPLE_ID
|
APPLE_ID
|
||||||
APPLE_TEAM_ID
|
APPLE_TEAM_ID
|
||||||
APPLE_APP_PASSWORD
|
APPLE_APP_PASSWORD
|
||||||
SPARKLE_PRIVATE_KEY
|
SPARKLE_PRIVATE_KEY
|
||||||
GITHUB_REPOSITORY
|
GITHUB_REPOSITORY
|
||||||
|
RELEASE_BASE_URL
|
||||||
)
|
)
|
||||||
|
|
||||||
for variable in "${required_variables[@]}"; do
|
for variable in "${required_variables[@]}"; do
|
||||||
@@ -57,12 +59,12 @@ SPARKLE_FRAMEWORK="$APP_PATH/Contents/Frameworks/Sparkle.framework"
|
|||||||
SPARKLE_CONTENTS="$SPARKLE_FRAMEWORK/Versions/B"
|
SPARKLE_CONTENTS="$SPARKLE_FRAMEWORK/Versions/B"
|
||||||
|
|
||||||
sign_component() {
|
sign_component() {
|
||||||
codesign --force --timestamp --options runtime --sign "$SIGNING_IDENTITY" "$1"
|
codesign --force --timestamp --options runtime --keychain "$SIGNING_KEYCHAIN" --sign "$SIGNING_IDENTITY" "$1"
|
||||||
}
|
}
|
||||||
|
|
||||||
sign_component "$SPARKLE_CONTENTS/XPCServices/Installer.xpc"
|
sign_component "$SPARKLE_CONTENTS/XPCServices/Installer.xpc"
|
||||||
if [[ -d "$SPARKLE_CONTENTS/XPCServices/Downloader.xpc" ]]; then
|
if [[ -d "$SPARKLE_CONTENTS/XPCServices/Downloader.xpc" ]]; then
|
||||||
codesign --force --timestamp --options runtime \
|
codesign --force --timestamp --options runtime --keychain "$SIGNING_KEYCHAIN" \
|
||||||
--preserve-metadata=entitlements \
|
--preserve-metadata=entitlements \
|
||||||
--sign "$SIGNING_IDENTITY" \
|
--sign "$SIGNING_IDENTITY" \
|
||||||
"$SPARKLE_CONTENTS/XPCServices/Downloader.xpc"
|
"$SPARKLE_CONTENTS/XPCServices/Downloader.xpc"
|
||||||
@@ -71,7 +73,7 @@ sign_component "$SPARKLE_CONTENTS/Autoupdate"
|
|||||||
sign_component "$SPARKLE_CONTENTS/Updater.app"
|
sign_component "$SPARKLE_CONTENTS/Updater.app"
|
||||||
sign_component "$SPARKLE_FRAMEWORK"
|
sign_component "$SPARKLE_FRAMEWORK"
|
||||||
|
|
||||||
codesign --force --timestamp --options runtime \
|
codesign --force --timestamp --options runtime --keychain "$SIGNING_KEYCHAIN" \
|
||||||
--entitlements meetingnotes/meetingnotes.entitlements \
|
--entitlements meetingnotes/meetingnotes.entitlements \
|
||||||
--sign "$SIGNING_IDENTITY" \
|
--sign "$SIGNING_IDENTITY" \
|
||||||
"$APP_PATH"
|
"$APP_PATH"
|
||||||
@@ -116,7 +118,7 @@ if [[ -z "$GENERATE_APPCAST" ]]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
DOWNLOAD_URL="https://github.com/$GITHUB_REPOSITORY/releases/download/v$VERSION/"
|
DOWNLOAD_URL="$RELEASE_BASE_URL/releases/download/v$VERSION/"
|
||||||
printf '%s' "$SPARKLE_PRIVATE_KEY" | "$GENERATE_APPCAST" "$RELEASE_DIR" \
|
printf '%s' "$SPARKLE_PRIVATE_KEY" | "$GENERATE_APPCAST" "$RELEASE_DIR" \
|
||||||
--ed-key-file - \
|
--ed-key-file - \
|
||||||
--download-url-prefix "$DOWNLOAD_URL" \
|
--download-url-prefix "$DOWNLOAD_URL" \
|
||||||
@@ -127,7 +129,7 @@ grep -q "$DOWNLOAD_URL$ARCHIVE_NAME" "$RELEASE_DIR/appcast.xml"
|
|||||||
grep -q 'sparkle:edSignature=' "$RELEASE_DIR/appcast.xml"
|
grep -q 'sparkle:edSignature=' "$RELEASE_DIR/appcast.xml"
|
||||||
|
|
||||||
if [[ -n "${GITHUB_STEP_SUMMARY:-}" ]]; then
|
if [[ -n "${GITHUB_STEP_SUMMARY:-}" ]]; then
|
||||||
printf 'Built, Developer ID-signed, notarized, and stapled Meetingnotes %s. The GitHub release is ready to publish.\n' \
|
printf 'Built, Developer ID-signed, notarized, and stapled Meetingnotes %s. The Gitea release is ready to publish.\n' \
|
||||||
"$VERSION" >> "$GITHUB_STEP_SUMMARY"
|
"$VERSION" >> "$GITHUB_STEP_SUMMARY"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,45 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Publish both signed assets together, keeping incomplete uploads as a draft."""
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import urllib.error
|
||||||
|
import urllib.parse
|
||||||
|
import urllib.request
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
base = os.environ["GITEA_SERVER_URL"].rstrip("/") + "/api/v1/repos/" + os.environ["GITHUB_REPOSITORY"]
|
||||||
|
token = os.environ["GITEA_TOKEN"]
|
||||||
|
version = os.environ["VERSION"]
|
||||||
|
|
||||||
|
|
||||||
|
class NoRedirect(urllib.request.HTTPRedirectHandler):
|
||||||
|
def redirect_request(self, *args, **kwargs):
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def request(path, method="GET", data=None, binary=False):
|
||||||
|
body = data if binary else None if data is None else json.dumps(data).encode()
|
||||||
|
req = urllib.request.Request(base + path, method=method, data=body, headers={
|
||||||
|
"Authorization": "token " + token,
|
||||||
|
"Content-Type": "application/octet-stream" if binary else "application/json",
|
||||||
|
"User-Agent": "Meetingnotes-release",
|
||||||
|
})
|
||||||
|
with urllib.request.build_opener(NoRedirect()).open(req, timeout=120) as response:
|
||||||
|
raw = response.read()
|
||||||
|
return json.loads(raw) if raw else None
|
||||||
|
|
||||||
|
|
||||||
|
release_dir = Path(os.environ["RUNNER_TEMP"]) / "meetingnotes-release/release"
|
||||||
|
assets = [release_dir / f"Meetingnotes-{version}.zip", release_dir / "appcast.xml"]
|
||||||
|
for asset in assets:
|
||||||
|
if not asset.is_file() or not asset.stat().st_size:
|
||||||
|
raise RuntimeError(f"Missing release artifact: {asset.name}")
|
||||||
|
release = request("/releases", "POST", {
|
||||||
|
"tag_name": "v" + version, "target_commitish": os.environ["GITHUB_SHA"],
|
||||||
|
"name": "Meetingnotes " + version, "draft": True, "prerelease": False,
|
||||||
|
"body": "Developer ID signed, Apple notarized, and signed for Sparkle updates.\n\nBuilt from main at `" + os.environ["GITHUB_SHA"] + "`.",
|
||||||
|
})
|
||||||
|
for asset in assets:
|
||||||
|
request(f"/releases/{release['id']}/assets?name=" + urllib.parse.quote(asset.name), "POST", asset.read_bytes(), binary=True)
|
||||||
|
request(f"/releases/{release['id']}", "PATCH", {"draft": False})
|
||||||
|
print("Published Meetingnotes " + version)
|
||||||
@@ -0,0 +1,77 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Check the CI app's unauthenticated API without changing saved preferences."""
|
||||||
|
import json
|
||||||
|
import plistlib
|
||||||
|
import socket
|
||||||
|
import subprocess
|
||||||
|
import sys
|
||||||
|
import tempfile
|
||||||
|
import time
|
||||||
|
import urllib.error
|
||||||
|
import urllib.request
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
# Launch from the Mac's internal volume; the runner checkout is on removable storage.
|
||||||
|
cache = Path.home() / "Library/Caches/meetingnotes-ci"
|
||||||
|
cache.mkdir(parents=True, exist_ok=True)
|
||||||
|
with tempfile.TemporaryDirectory(prefix="smoke-", dir=cache) as directory:
|
||||||
|
staged = Path(directory) / "Meetingnotes.app"
|
||||||
|
subprocess.run(["ditto", sys.argv[1], str(staged)], check=True)
|
||||||
|
app = staged / "Contents/MacOS/Meetingnotes"
|
||||||
|
with (staged / "Contents/Info.plist").open("rb") as info_file:
|
||||||
|
bundle_id = plistlib.load(info_file)["CFBundleIdentifier"]
|
||||||
|
assert bundle_id == "net.jamesbone.meetingnotes.ci", "Smoke tests require the isolated CI app"
|
||||||
|
|
||||||
|
def clear_test_token():
|
||||||
|
result = subprocess.run(
|
||||||
|
["security", "delete-generic-password", "-s", bundle_id, "-a", "muteDeckAPIToken"],
|
||||||
|
capture_output=True, timeout=10,
|
||||||
|
)
|
||||||
|
if result.returncode not in (0, 44): # 44: item does not exist
|
||||||
|
raise RuntimeError("Could not clear the CI Keychain token")
|
||||||
|
|
||||||
|
clear_test_token()
|
||||||
|
with socket.socket() as listener:
|
||||||
|
listener.bind(("127.0.0.1", 0))
|
||||||
|
port = listener.getsockname()[1]
|
||||||
|
with tempfile.TemporaryFile() as log:
|
||||||
|
process = subprocess.Popen(
|
||||||
|
[str(app), "-muteDeckAPIEnabled", "YES", "-muteDeckAPIPort", str(port), "-hasCompletedOnboarding", "YES", "-hasAcceptedTerms", "YES", "-SUEnableAutomaticChecks", "NO"],
|
||||||
|
stdout=log, stderr=subprocess.STDOUT,
|
||||||
|
)
|
||||||
|
try:
|
||||||
|
for attempt in range(30):
|
||||||
|
if process.poll() is not None:
|
||||||
|
raise RuntimeError("CI app exited before the API became ready")
|
||||||
|
try:
|
||||||
|
with urllib.request.urlopen(f"http://127.0.0.1:{port}/api/info", timeout=2) as response:
|
||||||
|
info = json.load(response)
|
||||||
|
break
|
||||||
|
except (urllib.error.URLError, TimeoutError):
|
||||||
|
time.sleep(1)
|
||||||
|
else:
|
||||||
|
raise RuntimeError("CI API did not become ready")
|
||||||
|
assert info["name"] == "MeetingDebrief", "Unexpected API identity"
|
||||||
|
try:
|
||||||
|
urllib.request.urlopen(f"http://127.0.0.1:{port}/api/recording/status", timeout=2)
|
||||||
|
except urllib.error.HTTPError as error:
|
||||||
|
assert error.code == 401, f"Unexpected status: {error.code}"
|
||||||
|
else:
|
||||||
|
raise RuntimeError("Recording status allowed an unauthenticated request")
|
||||||
|
print("Local API readiness and authentication checks passed")
|
||||||
|
except Exception:
|
||||||
|
if process.poll() is None:
|
||||||
|
sample = subprocess.run(["sample", str(process.pid), "1", "1"], capture_output=True, text=True, timeout=10)
|
||||||
|
print(sample.stdout.split("Binary Images:")[0], file=sys.stderr)
|
||||||
|
log.seek(0)
|
||||||
|
print(log.read().decode(errors="replace")[-8000:], file=sys.stderr)
|
||||||
|
raise
|
||||||
|
finally:
|
||||||
|
if process.poll() is None:
|
||||||
|
process.terminate()
|
||||||
|
try:
|
||||||
|
process.wait(timeout=10)
|
||||||
|
except subprocess.TimeoutExpired:
|
||||||
|
process.kill()
|
||||||
|
process.wait()
|
||||||
|
clear_test_token()
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Import the CI certificate into an isolated keychain for one release command."""
|
||||||
|
import base64
|
||||||
|
import os
|
||||||
|
import re
|
||||||
|
import secrets
|
||||||
|
import subprocess
|
||||||
|
import sys
|
||||||
|
import tempfile
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
|
||||||
|
def security(*args):
|
||||||
|
result = subprocess.run(["security", *args], capture_output=True, text=True)
|
||||||
|
if result.returncode:
|
||||||
|
raise RuntimeError(f"security {args[0]} failed (output withheld to protect credentials)")
|
||||||
|
return result.stdout
|
||||||
|
|
||||||
|
|
||||||
|
with tempfile.TemporaryDirectory(prefix="meetingnotes-signing-", dir=os.environ["RUNNER_TEMP"]) as directory:
|
||||||
|
keychain = str(Path(directory) / "release.keychain-db")
|
||||||
|
certificate = Path(directory) / "certificate.p12"
|
||||||
|
certificate.write_bytes(base64.b64decode(os.environ["APPLE_CERTIFICATE_P12"]))
|
||||||
|
certificate.chmod(0o600)
|
||||||
|
password = secrets.token_urlsafe(32)
|
||||||
|
created = False
|
||||||
|
try:
|
||||||
|
security("create-keychain", "-p", password, keychain)
|
||||||
|
created = True
|
||||||
|
security("set-keychain-settings", "-lut", "21600", keychain)
|
||||||
|
security("unlock-keychain", "-p", password, keychain)
|
||||||
|
security("import", str(certificate), "-k", keychain, "-P", os.environ["APPLE_CERTIFICATE_PASSWORD"], "-T", "/usr/bin/codesign", "-T", "/usr/bin/security")
|
||||||
|
security("set-key-partition-list", "-S", "apple-tool:,apple:", "-s", "-k", password, keychain)
|
||||||
|
identities = security("find-identity", "-v", "-p", "codesigning", keychain)
|
||||||
|
match = re.search(r'([0-9A-F]{40}) "Developer ID Application:', identities)
|
||||||
|
if not match:
|
||||||
|
raise RuntimeError("The certificate contains no valid Developer ID Application identity")
|
||||||
|
environment = dict(os.environ, SIGNING_IDENTITY=match[1], SIGNING_KEYCHAIN=keychain)
|
||||||
|
status = subprocess.run(sys.argv[1:], env=environment).returncode
|
||||||
|
finally:
|
||||||
|
if created:
|
||||||
|
security("delete-keychain", keychain)
|
||||||
|
sys.exit(status)
|
||||||
Reference in New Issue
Block a user