From 32a9a5484cee7e80dff85628a8de60736552a975 Mon Sep 17 00:00:00 2001 From: Stephen DeRosa Date: Tue, 13 Oct 2026 11:20:57 -0600 Subject: [PATCH 1/2] ci: deprecate Intel macOS runners (BOT-575) --- .github/workflows/builds.yml | 10 +--------- .github/workflows/make-release.yml | 17 +++-------------- .github/workflows/tests.yml | 14 +------------- AGENTS.md | 4 +++- docs/building.md | 4 ++++ 5 files changed, 12 insertions(+), 37 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 4db2ec45..163e9ea3 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -52,11 +52,7 @@ jobs: name: macos-arm64 build_cmd: ./build.sh release-examples --bundle --prefix sdk-out/livekit-sdk-macos-arm64 build_dir: build-release - - os: macos-26-large - name: macos-x64 - build_cmd: ./build.sh release-examples --bundle --prefix sdk-out/livekit-sdk-macos-x64 --macos-arch x86_64 - build_dir: build-release - # Pinned to Windows 2022 for current VS 17 implementation + # Pinned to Windows 2022 for current VS 17 implementation - os: windows-2022 name: windows-x64 build_cmd: .\build.cmd release-examples --bundle --prefix sdk-out\livekit-sdk-windows-x64 @@ -146,10 +142,6 @@ jobs: with: toolchain: stable - - name: Install Rust cross-compilation target - if: matrix.name == 'macos-x64' - run: rustup target add x86_64-apple-darwin - # ---------- Cache Cargo ---------- # The Rust FFI is built from the pinned client-sdk-rust submodule. Its # compiled output only changes when the submodule commit changes, so we diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml index ca085dd9..728ae2ca 100644 --- a/.github/workflows/make-release.yml +++ b/.github/workflows/make-release.yml @@ -39,10 +39,7 @@ jobs: - os: macos-26-xlarge name: macos-arm64 generator: Ninja - - os: macos-26-large - name: macos-x64 - generator: Ninja - # Pinned to Windows 2022 for current VS 17 implementation + # Pinned to Windows 2022 for current VS 17 implementation - os: windows-2022 name: windows-x64 generator: "Visual Studio 17 2022" @@ -146,10 +143,6 @@ jobs: with: toolchain: stable - - name: Install Rust cross-compilation target - if: matrix.name == 'macos-x64' - run: rustup target add x86_64-apple-darwin - # ---------- Cache Cargo ---------- # Key the target cache on the client-sdk-rust submodule SHA (Cargo.lock is # pinned inside the submodule and froze the old cache). No clean step runs @@ -217,11 +210,7 @@ jobs: exit 1 fi - if [[ "${{ matrix.name }}" == "macos-x64" ]]; then - ./build.sh release-examples --version "$version" --bundle --prefix "$bundleDir" --macos-arch x86_64 - else - ./build.sh release-examples --version "$version" --bundle --prefix "$bundleDir" - fi + ./build.sh release-examples --version "$version" --bundle --prefix "$bundleDir" # List bundle contents echo "Bundle contents:" @@ -413,7 +402,7 @@ jobs: ls -la # Create tar.gz for Ubuntu and macOS - for platform in ubuntu-22.04-x64 ubuntu-22.04-arm64 ubuntu-24.04-x64 ubuntu-24.04-arm64 macos-arm64 macos-x64; do + for platform in ubuntu-22.04-x64 ubuntu-22.04-arm64 ubuntu-24.04-x64 ubuntu-24.04-arm64 macos-arm64; do dirName="livekit-sdk-${platform}-${VERSION}" if [[ -d "${dirName}" ]]; then echo "Creating archive for ${platform}..." diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index efeaf448..cb75e741 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -154,10 +154,6 @@ jobs: - os: macos-26-xlarge name: macos-arm64 e2e-testing: true - - os: macos-26-large - name: macos-x64 - macos_arch: x86_64 - e2e-testing: true # Pinned to Windows 2022 for current VS 17 implementation - os: windows-2022 name: windows-x64 @@ -250,10 +246,6 @@ jobs: with: toolchain: stable - - name: Install Rust cross-compilation target - if: matrix.name == 'macos-x64' - run: rustup target add x86_64-apple-darwin - # ---------- Cache Cargo ---------- # See builds.yml for the rationale: the Rust FFI output only changes with # the client-sdk-rust submodule commit, so key the target cache on the @@ -323,11 +315,7 @@ jobs: run: | set -euo pipefail chmod +x build.sh - build_cmd=(./build.sh "${{ inputs.build_type }}-tests") - if [[ -n "${{ matrix.macos_arch || '' }}" ]]; then - build_cmd+=(--macos-arch "${{ matrix.macos_arch }}") - fi - "${build_cmd[@]}" + ./build.sh "${{ inputs.build_type }}-tests" - name: Build tests (Windows) if: runner.os == 'Windows' diff --git a/AGENTS.md b/AGENTS.md index 58985b83..8a86929d 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -27,9 +27,11 @@ The SDK must be supported on the following platforms: - windows x64 - linux x86_64 - linux arm64 -- macOS x86_64 - macOS arm64 +macOS x86_64 (Intel) is deprecated. CI no longer builds or tests on Intel macOS +runners, and new releases no longer include `macos-x64` SDK bundles. + ### FFI Patterns SDK features follow one of two FFI patterns: diff --git a/docs/building.md b/docs/building.md index fd4cbb83..e6454749 100644 --- a/docs/building.md +++ b/docs/building.md @@ -23,6 +23,10 @@ CMake/vcpkg flows. | Linux | GCC 9+ or Clang 10+ | `apt` / `dnf` (or vcpkg) | | macOS | Xcode 12+ (macOS 12.3+ for ScreenCaptureKit) | Homebrew (or vcpkg) | +macOS CI and release bundles target arm64 (Apple Silicon). macOS x86_64 (Intel) +is deprecated: CI no longer builds or tests it, and new releases no longer +include `macos-x64` SDK bundles. + ## Clone the repository The SDK depends on the [`client-sdk-rust`](https://github.com/livekit/rust-sdks) From 7f9ef7b10f6b9e8b0826332d4bb856f8fc94f78e Mon Sep 17 00:00:00 2001 From: Stephen DeRosa Date: Tue, 13 Oct 2026 11:43:45 -0600 Subject: [PATCH 2/2] trim --- AGENTS.md | 3 --- docs/building.md | 4 ---- 2 files changed, 7 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 8a86929d..8b1bab58 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -29,9 +29,6 @@ The SDK must be supported on the following platforms: - linux arm64 - macOS arm64 -macOS x86_64 (Intel) is deprecated. CI no longer builds or tests on Intel macOS -runners, and new releases no longer include `macos-x64` SDK bundles. - ### FFI Patterns SDK features follow one of two FFI patterns: diff --git a/docs/building.md b/docs/building.md index e6454749..fd4cbb83 100644 --- a/docs/building.md +++ b/docs/building.md @@ -23,10 +23,6 @@ CMake/vcpkg flows. | Linux | GCC 9+ or Clang 10+ | `apt` / `dnf` (or vcpkg) | | macOS | Xcode 12+ (macOS 12.3+ for ScreenCaptureKit) | Homebrew (or vcpkg) | -macOS CI and release bundles target arm64 (Apple Silicon). macOS x86_64 (Intel) -is deprecated: CI no longer builds or tests it, and new releases no longer -include `macos-x64` SDK bundles. - ## Clone the repository The SDK depends on the [`client-sdk-rust`](https://github.com/livekit/rust-sdks)