diff --git a/.github/workflows/pr-fast-ci.yml b/.github/workflows/pr-fast-ci.yml index c835e11..9f276b8 100644 --- a/.github/workflows/pr-fast-ci.yml +++ b/.github/workflows/pr-fast-ci.yml @@ -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: >- diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d16297f..393162c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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: diff --git a/scripts/build-native-app.sh b/scripts/build-native-app.sh index 3fcf54e..fc900c2 100755 --- a/scripts/build-native-app.sh +++ b/scripts/build-native-app.sh @@ -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