Skip to content

Commit

Permalink
Try to use newer CMake from base Windows-2019 image on Windows R buil…
Browse files Browse the repository at this point in the history
…d instead of installing via MSYS2
  • Loading branch information
raulcd committed Jan 22, 2025
1 parent 908b080 commit 48a6d0a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/r.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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++
Expand Down
4 changes: 1 addition & 3 deletions ci/scripts/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit 48a6d0a

Please sign in to comment.