From 48a6d0a13f084261b05664a330a308e2cf3e8a73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= <raulcumplido@gmail.com>
Date: Wed, 22 Jan 2025 11:13:34 +0100
Subject: [PATCH] Try to use newer CMake from base Windows-2019 image on
 Windows R build instead of installing via MSYS2

---
 .github/workflows/r.yml | 6 ------
 ci/scripts/PKGBUILD     | 4 +---
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml
index 0e9fa781d0e42..cb000f8b95c1b 100644
--- a/.github/workflows/r.yml
+++ b/.github/workflows/r.yml
@@ -282,12 +282,6 @@ jobs:
           restore-keys: |
             r-${{ matrix.config.rtools }}-ccache-mingw-${{ matrix.config.arch }}-${{ hashFiles('cpp/src/**/*.cc','cpp/src/**/*.h)') }}-
             r-${{ matrix.config.rtools }}-ccache-mingw-${{ matrix.config.arch }}-
-      - name: Install CMake via MSYS2
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: UCRT64
-          update: true
-          install: mingw-w64-ucrt-x86_64-cmake
       - uses: r-lib/actions/setup-r@v2
         with:
           # Note: RTools must be 40 here because RTools40 + ucrt is how we build the Arrow C++
diff --git a/ci/scripts/PKGBUILD b/ci/scripts/PKGBUILD
index 56a463f6422fb..9ecdc2ad2e92a 100644
--- a/ci/scripts/PKGBUILD
+++ b/ci/scripts/PKGBUILD
@@ -83,10 +83,8 @@ build() {
   # MSYS2_ARG_CONV_EXCL is needed to prevent autoconverting CMAKE_INSTALL_PREFIX
   # to Windows paths. See https://www.msys2.org/docs/filesystem-paths/#process-arguments
 
-  # We install CMake via the msys2 GitHub action. We have to use the installed
-  # CMake to build Arrow which is in the Program Files directory.
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
-    "${PROGRAMFILES}\CMake\bin\cmake.exe" \
+    cmake \
     ${ARROW_CPP_DIR} \
     -G "MSYS Makefiles" \
     -DARROW_ACERO=ON \