Release the Mac app from CI's build, and keep pull requests off the scarce macOS runners

.github/workflows/ci.yml

@@ -34,13 +34,19 @@ jobs:
     name: test (${{ matrix.os }})
     strategy:
       fail-fast: false
+      # macOS runners are the scarce ones: two at a time, shared with the phone builds and the
+      # release. A pull request tests on Linux and Windows and main adds macOS, so a break only a
+      # Mac shows is found on main, before the release it would ship in.
       matrix:
-        os: [ubuntu-22.04, macos-latest, windows-latest]
-        include:
-          - os: macos-latest
-            features: --features tinyclient/gui
+        os: ${{ fromJSON(github.event_name == 'push' && '["ubuntu-22.04","macos-latest","windows-latest"]' || '["ubuntu-22.04","windows-latest"]') }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
+    # The window's own tests build only with the gui feature. Linux runs them everywhere, since a
+    # pull request has no Mac, and on main too: main writes the cache a pull request restores,
+    # and a Linux build without the feature left every pull request compiling it cold (17
+    # minutes, not 1.5).
+    env:
+      FEATURES: ${{ matrix.os != 'windows-latest' && '--features tinyclient/gui' || '' }}
     steps:
       - uses: actions/checkout@v5
       - uses: ./.github/actions/setup-rust
@@ -49,20 +55,20 @@ jobs:
       - uses: taiki-e/install-action@nextest
       # nextest runs the test binaries side by side, where `cargo test` ran them one at a time.
       # The window's own tests (prefs, search, shortcuts against the menus, the controls) build
-      # only with the gui feature, so macOS turns it on for the one pass over the workspace.
+      # only with the gui feature, which FEATURES turns on for the one pass over the workspace.
       # Tests use the real media engine. Building it inside each nextest process repeats
       # Cargo resolution and serializes tests on its build lock (five minutes on a cold Mac).
       # Use the whole workspace graph so tests and the engine share dependency features.
       - name: Build test programs
         shell: bash
         run: |
-          cargo build --workspace --all-targets ${{ matrix.features }} --timings
+          cargo build --workspace --all-targets ${{ env.FEATURES }} --timings
           echo "TINYCLIENT_TEST_MEDIAD=$GITHUB_WORKSPACE/target/debug/mediad${{ runner.os == 'Windows' && '.exe' || '' }}" >> "$GITHUB_ENV"
       - name: Test
-        run: cargo nextest run --workspace ${{ matrix.features }}
+        run: cargo nextest run --workspace ${{ env.FEATURES }}
       # nextest does not run doc tests.
       - name: Doc tests
-        run: cargo test --workspace --doc ${{ matrix.features }}
+        run: cargo test --workspace --doc ${{ env.FEATURES }}
       # The cfg(target_os = "ios"|"android") arms are not type-checked on this host; this proves
       # the mobile feature does not disturb the desktop arms. It shares this job's cache.
       - name: Window with the mobile feature enabled

packaging/ci/reuse-binaries.sh

@@ -27,10 +27,12 @@ take() {
     mkdir -p target/release
     case "$kind" in
         macos)
-            app=$(find "$stage" -type d -name 'tinyclient.app' | head -1)
-            [ -n "$app" ] || return 1
+            # CI uploads target/release/tinyclient.app as a directory, and upload-artifact keeps
+            # what is inside it: the download is Contents/ with no tinyclient.app around it.
+            macos=$(find "$stage" -type d -path '*/Contents/MacOS' | head -1)
+            [ -n "$macos" ] || return 1
             for program in $programs; do
-                cp "$app/Contents/MacOS/$program" "target/release/$program"
+                cp "$macos/$program" "target/release/$program"
                 chmod +x "target/release/$program"
             done
             ;;