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
4 changes: 3 additions & 1 deletion .github/workflows/pr-fast-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ jobs:

native-app-swift-tests:
name: Native App Swift Tests
runs-on: ['self-hosted', 'private', 'macOS', 'ARM64', 'xcode']
# Hosted fallback: the self-hosted macOS/Xcode slots are currently offline,
# and this PR needs the native app compile gate to complete before merge.
runs-on: macos-latest
timeout-minutes: 20
needs: changes
if: >-
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,6 @@ jobs:
./rust/target/release/apw --version
./rust/target/release/apw status --json

- name: Build native app bundle
env:
APW_SPARKLE_PUBLIC_ED_KEY: ${{ vars.APW_SPARKLE_PUBLIC_ED_KEY || '' }}
run: ./scripts/build-native-app.sh

- name: Sign and notarize native app bundle
if: startsWith(github.ref, 'refs/tags/v')
env:
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-native-app.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ if [[ -n "$RESOURCE_BUNDLE" ]]; then
fi

if otool -L "$MACOS_DIR/$EXECUTABLE_NAME" | grep -q '@rpath/Sparkle.framework/'; then
SPARKLE_FRAMEWORK="$(find "$PACKAGE_DIR/.build" -path '*/release/Sparkle.framework' -type d | head -n 1 || true)"
SPARKLE_FRAMEWORK="$(find "$PACKAGE_DIR/.build" \( -path '*/release/Sparkle.framework' -o -path '*/Release/Sparkle.framework' \) -type d | head -n 1 || true)"
if [[ -z "$SPARKLE_FRAMEWORK" ]]; then
echo "APW links Sparkle.framework but SwiftPM did not produce a release framework." >&2
exit 1
Expand Down
Loading