Skip to content

Commit 5c07053

Browse files
committed
Updated CI setup scripts for windows
1 parent 4da7280 commit 5c07053

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

ci/scripts/PKGBUILD

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ url="https://arrow.apache.org/"
2626
license=("Apache-2.0")
2727
depends=("${MINGW_PACKAGE_PREFIX}-bzip2"
2828
"${MINGW_PACKAGE_PREFIX}-curl" # for google-cloud-cpp bundled build
29+
"${MINGW_PACKAGE_PREFIX}-libxml2" # for azure
2930
"${MINGW_PACKAGE_PREFIX}-libutf8proc"
3031
"${MINGW_PACKAGE_PREFIX}-re2"
3132
"${MINGW_PACKAGE_PREFIX}-snappy"
@@ -122,6 +123,7 @@ build() {
122123
-DARROW_PACKAGE_PREFIX="${MINGW_PREFIX}" \
123124
-DARROW_PARQUET=ON \
124125
-DARROW_S3=ON \
126+
-DARROW_AZURE=ON \
125127
-DARROW_SNAPPY_USE_SHARED=OFF \
126128
-DARROW_USE_GLOG=OFF \
127129
-DARROW_UTF8PROC_USE_SHARED=OFF \

ci/scripts/r_windows_build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,23 +66,23 @@ if [ -d mingw64/lib/ ]; then
6666
# Move the 64-bit versions of libarrow into the expected location
6767
mv mingw64/lib/*.a $DST_DIR/lib/x64
6868
# These are from https://dl.bintray.com/rtools/mingw{32,64}/
69-
cp $MSYS_LIB_DIR/mingw64/lib/lib{snappy,zstd,lz4,brotli*,bz2,crypto,curl,ss*,utf8proc,re2,nghttp2}.a $DST_DIR/lib/x64
69+
cp $MSYS_LIB_DIR/mingw64/lib/lib{snappy,zstd,lz4,brotli*,bz2,crypto,curl,ss*,utf8proc,re2,nghttp2,libxml2}.a $DST_DIR/lib/x64
7070
fi
7171

7272
# Same for the 32-bit versions
7373
if [ -d mingw32/lib/ ]; then
7474
ls $MSYS_LIB_DIR/mingw32/lib/
7575
mkdir -p $DST_DIR/lib/i386
7676
mv mingw32/lib/*.a $DST_DIR/lib/i386
77-
cp $MSYS_LIB_DIR/mingw32/lib/lib{snappy,zstd,lz4,brotli*,bz2,crypto,curl,ss*,utf8proc,re2,nghttp2}.a $DST_DIR/lib/i386
77+
cp $MSYS_LIB_DIR/mingw32/lib/lib{snappy,zstd,lz4,brotli*,bz2,crypto,curl,ss*,utf8proc,re2,nghttp2,libxml2}.a $DST_DIR/lib/i386
7878
fi
7979

8080
# Do the same also for ucrt64
8181
if [ -d ucrt64/lib/ ]; then
8282
ls $MSYS_LIB_DIR/ucrt64/lib/
8383
mkdir -p $DST_DIR/lib/x64-ucrt
8484
mv ucrt64/lib/*.a $DST_DIR/lib/x64-ucrt
85-
cp $MSYS_LIB_DIR/ucrt64/lib/lib{snappy,zstd,lz4,brotli*,bz2,crypto,curl,ss*,utf8proc,re2,nghttp2}.a $DST_DIR/lib/x64-ucrt
85+
cp $MSYS_LIB_DIR/ucrt64/lib/lib{snappy,zstd,lz4,brotli*,bz2,crypto,curl,ss*,utf8proc,re2,nghttp2,libxml2}.a $DST_DIR/lib/x64-ucrt
8686
fi
8787

8888
# Create build artifact

0 commit comments

Comments
 (0)