Remove manual Installation of CMake from pacman not present

apache · Dec 19, 2024 · ecf01cc · ecf01cc
1 parent 5201d8b
commit ecf01cc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml
@@ -282,11 +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
-        shell: bash
-        run: |
-          pacman --noconfirm -Syy
-          pacman --noconfirm -S ${MINGW_PACKAGE_PREFIX}-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/r_windows_build.sh b/ci/scripts/r_windows_build.sh
@@ -25,11 +25,13 @@ export ARROW_HOME="$(cd "${ARROW_HOME}" && pwd)"
 
 # Uncomment L38-41 if you're testing a new rtools dependency that hasn't yet sync'd to CRAN
 # curl https://raw.githubusercontent.com/r-windows/rtools-packages/master/pacman.conf > /etc/pacman.conf
-# curl -OSsl "http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz"
-# pacman -U --noconfirm msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz && rm msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
-# pacman --noconfirm -Scc
+cat /etc/pacman.conf || echo "/etc/pacman.conf not found"
+curl -OSsl "http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz"
+pacman -U --noconfirm msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz && rm msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
+pacman --noconfirm -Scc
 
 pacman --noconfirm -Syy
+pacman --noconfirm -S ${MINGW_PACKAGE_PREFIX}-cmake
 RWINLIB_LIB_DIR="lib"
 : ${MINGW_ARCH:="mingw32 mingw64 ucrt64"}