diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 9d417942..55f3591a 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -26,7 +26,10 @@ jobs: matrix: debug: [false, true] zts: [true] - os: ['14'] + # Homebrew 7.0.0 made macOS 14 Tier 3 and builds no bottles for it, so + # every dependency built from source there, llvm among them for nghttp2; + # GitHub removes the macos-14 runners on 2026-11-02. + os: ['15'] name: "MACOS_ARM64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}" runs-on: macos-${{ matrix.os }} diff --git a/.github/workflows/ctrl-c.yml b/.github/workflows/ctrl-c.yml index 0debb444..d11d5c25 100644 --- a/.github/workflows/ctrl-c.yml +++ b/.github/workflows/ctrl-c.yml @@ -19,10 +19,8 @@ on: - '.github/workflows/ctrl-c.yml' env: - # TODO: back to `true-async` / `main` after the #109 sigaction-hook pair merges - # (php-src 109-zend-sigaction-hook + php-async fix-signal-pcntl-clobber). - PHP_SRC_BRANCH: 109-zend-sigaction-hook - PHP_ASYNC_BRANCH: fix-signal-pcntl-clobber + PHP_SRC_BRANCH: true-async + PHP_ASYNC_BRANCH: main CCACHE_DIR: /tmp/ccache jobs: @@ -31,7 +29,7 @@ jobs: # -------------------------------------------------------------------- ctrl-c-macos: name: "CTRLC_MACOS_ARM64" - runs-on: macos-14 + runs-on: macos-15 # macos-14 runners are removed on 2026-11-02 timeout-minutes: 60 steps: diff --git a/.github/workflows/debug-macos-workers.yml b/.github/workflows/debug-macos-workers.yml index 22a80964..4f465343 100644 --- a/.github/workflows/debug-macos-workers.yml +++ b/.github/workflows/debug-macos-workers.yml @@ -18,7 +18,7 @@ env: jobs: workers: name: MACOS_ARM64_WORKERS_DEBUG - runs-on: macos-14 + runs-on: macos-15 # macOS 14: no Homebrew bottles, runners removed 2026-11-02 timeout-minutes: 40 steps: