Skip to content

Commit

Permalink
Just testing at this point
Browse files Browse the repository at this point in the history
  • Loading branch information
raulcd committed Dec 19, 2024
1 parent e2b0c6e commit 17c0d57
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
14 changes: 11 additions & 3 deletions .github/workflows/r.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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++
Expand Down
5 changes: 2 additions & 3 deletions ci/scripts/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 \
Expand Down

0 comments on commit 17c0d57

Please sign in to comment.