From 38f18681816aebb0b97a9bca095b662a836e167f Mon Sep 17 00:00:00 2001 From: Leo Li Date: Thu, 24 Sep 2026 03:43:13 +0000 Subject: [PATCH] ci: stop pinning remote-daemon macOS tests to the macOS 26 pool remote-daemon-macos-tests runs plain go test with no Xcode or GUI, but was pinned to MACOS_RUNNER_26 (Blacksmith 26), the pool pull-request app-host work queues on. It now follows the pull-request lane (MACOS_RUNNER_PR) on pull requests and Blacksmith 15 otherwise, like the other pull-request macOS jobs. Forks keep hosted macos-15. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01EduXdN9PKnGsMQztJK7WeE --- .github/workflows/remote-daemon.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/remote-daemon.yml b/.github/workflows/remote-daemon.yml index b566853c6c74..c35ddeb26873 100644 --- a/.github/workflows/remote-daemon.yml +++ b/.github/workflows/remote-daemon.yml @@ -77,7 +77,10 @@ jobs: # request only Linux packaging validation for publishing-only changes. if: ${{ github.event_name != 'pull_request' || inputs.native_tests }} needs: remote-daemon-admission - runs-on: ${{ github.repository_owner != 'manaflow-ai' && 'macos-15' || (vars.MACOS_RUNNER_26 || 'blacksmith-6vcpu-macos-26') }} + # Plain `go test` with no Xcode or GUI: any Mac will do. Follow the same + # lanes as the other pull-request macOS jobs instead of pinning the + # contended macOS 26 pool. + runs-on: ${{ github.repository_owner != 'manaflow-ai' && 'macos-15' || github.event_name == 'pull_request' && (vars.MACOS_RUNNER_PR || 'blacksmith-6vcpu-macos-15') || vars.CI_PAID_MACOS_OVERFLOW == '1' && vars.MACOS_RUNNER_15 || 'blacksmith-6vcpu-macos-15' }} timeout-minutes: 15 steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2