diff --git a/.github/actions/microsoft-setup-toolchain/action.yml b/.github/actions/microsoft-setup-toolchain/action.yml index 31556f98a0d634..069b75279345aa 100644 --- a/.github/actions/microsoft-setup-toolchain/action.yml +++ b/.github/actions/microsoft-setup-toolchain/action.yml @@ -22,31 +22,10 @@ inputs: runs: using: composite steps: - - name: Pin cmake version - if: ${{ inputs.platform == 'macos' || inputs.platform == 'ios' || inputs.platform == 'visionos' }} - run: | - brew uninstall cmake - # Copied from https://github.com/actions/runner-images/pull/12791 - # Pin cmake to 3.31.6 due to a backward compatibility issue - # https://github.com/actions/runner-images/issues/11926 - cmake_commit="b4e46db74e74a8c1650b38b1da222284ce1ec5ce" - tap_name="local/pinned" - - echo "Creating local tap (no git)..." - brew tap-new --no-git "$tap_name" >/dev/null - - cmake_formula_dir="$(brew --repo "$tap_name")/Formula" - mkdir -p "$cmake_formula_dir" - - cmake_rb_link="https://raw.githubusercontent.com/Homebrew/homebrew-core/$cmake_commit/Formula/c/cmake.rb" - cmake_rb_path="$cmake_formula_dir/cmake.rb" - - echo "Downloading cmake.rb from $cmake_rb_link" - curl -fsSL "$cmake_rb_link" -o "$cmake_rb_path" - - echo "Installing cmake 3.31.6 from custom tap..." - brew install "$tap_name/cmake" - shell: bash + - name: Install cmake + uses: jwlawson/actions-setup-cmake@v2 + with: + cmake-version: '3.26.4' - name: Set up Ccache id: setup-ccache if: ${{ inputs.platform == 'ios' || inputs.platform == 'macos' || inputs.platform == 'visionos' }} diff --git a/.github/workflows/microsoft-build-rntester.yml b/.github/workflows/microsoft-build-rntester.yml index 20797e8f8d077b..feda8540055b67 100644 --- a/.github/workflows/microsoft-build-rntester.yml +++ b/.github/workflows/microsoft-build-rntester.yml @@ -6,7 +6,7 @@ on: jobs: build-rntester: name: "${{ matrix.platform }}, ${{ matrix.arch }}" - runs-on: macos-26 + runs-on: macos-latest timeout-minutes: 90 strategy: fail-fast: false