From 17c0d575a64e5e15e5a4604a578d4ef8b3ea2b65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Thu, 19 Dec 2024 14:14:12 +0100 Subject: [PATCH] Just testing at this point --- .github/workflows/r.yml | 14 +++++++++++--- ci/scripts/PKGBUILD | 5 ++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml index 2ee5ef43efde9..7d274abc58dc6 100644 --- a/.github/workflows/r.yml +++ b/.github/workflows/r.yml @@ -287,10 +287,18 @@ jobs: with: msystem: UCRT64 update: true - install: mingw-w64-ucrt-x86_64-cmake - - name: Debug CMake + install: mingw-w64-ucrt-x86_64-cmake mingw-w64-ucrt-x86_64-aws-sdk-cpp + - name: Debug CI paths shell: bash - run: where cmake + run: | + echo "## /c/msys64" + ls /c/msys64 + echo "## /c/msys64/usr/lib" + ls /c/msys64/usr/lib + echo "## /c/msys64/ucrt64" + ls /c/msys64/ucrt64 + echo "## /c/msys64/ucrt64/lib" + ls /c/msys64/ucrt64/lib - 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 a1f4d6823a51d..8f35619de963b 100644 --- a/ci/scripts/PKGBUILD +++ b/ci/scripts/PKGBUILD @@ -24,8 +24,7 @@ pkgdesc="Apache Arrow is a cross-language development platform for in-memory dat arch=("any") url="https://arrow.apache.org/" license=("Apache-2.0") -depends=("${MINGW_PACKAGE_PREFIX}-aws-sdk-cpp" - "${MINGW_PACKAGE_PREFIX}-bzip2" +depends=("${MINGW_PACKAGE_PREFIX}-bzip2" "${MINGW_PACKAGE_PREFIX}-curl" # for google-cloud-cpp bundled build "${MINGW_PACKAGE_PREFIX}-libutf8proc" "${MINGW_PACKAGE_PREFIX}-re2" @@ -82,7 +81,7 @@ build() { # segfaults in tests MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ - "C:\Program Files\CMake\bin\cmake.exe" \ + "${PROGRAMFILES}\CMake\bin\cmake.exe" \ ${ARROW_CPP_DIR} \ -G "MSYS Makefiles" \ -DARROW_ACERO=ON \