Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ARROW-11926: [R] Add ucrt64 binaries and fix CI #10372

Closed
wants to merge 3 commits into from
Closed

ARROW-11926: [R] Add ucrt64 binaries and fix CI #10372

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be97143
R: also build ucrt64 binaries
jeroen May 21, 2021
82b8cc0
comment out legacy workaround
jeroen May 21, 2021
14d7a0f
Delete keyring updating
nealrichardson May 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 14 additions & 5 deletions ci/scripts/r_windows_build.sh
View file
Open in desktop
Expand Up @@ -27,10 +27,10 @@ if [ "$RTOOLS_VERSION" = "35" ]; then
# Use rtools-backports if building with rtools35
curl https://raw.githubusercontent.com/r-windows/rtools-backports/master/pacman.conf > /etc/pacman.conf
# Update keys: https://www.msys2.org/news/#2020-06-29-new-packagers
nealrichardson marked this conversation as resolved.
Show resolved Hide resolved
msys2_repo_base_url=https://repo.msys2.org/msys
curl -OSsL "${msys2_repo_base_url}/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
#msys2_repo_base_url=https://repo.msys2.org/msys
#curl -OSsL "${msys2_repo_base_url}/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
nealrichardson marked this conversation as resolved.
Show resolved Hide resolved
pacman --noconfirm -Syy
# lib-4.9.3 is for libraries compiled with gcc 4.9 (Rtools 3.5)
RWINLIB_LIB_DIR="lib-4.9.3"
Expand All @@ -43,6 +43,7 @@ else

pacman --noconfirm -Syy
RWINLIB_LIB_DIR="lib"
export MINGW_ARCH="mingw32 mingw64 ucrt64"
fi

cp $ARROW_HOME/ci/scripts/PKGBUILD .
Expand All @@ -64,7 +65,7 @@ MSYS_LIB_DIR="/c/rtools40"
ls $MSYS_LIB_DIR/mingw64/lib/
ls $MSYS_LIB_DIR/mingw32/lib/

# Untar the two builds we made
# Untar the three builds we made
ls *.xz | xargs -n 1 tar -xJf
mkdir -p $DST_DIR
# Grab the headers from one, either one is fine
Expand Down Expand Up @@ -94,6 +95,14 @@ cp $MSYS_LIB_DIR/mingw32/lib/lib{thrift,snappy}.a $DST_DIR/${RWINLIB_LIB_DIR}/i3
cp $MSYS_LIB_DIR/mingw64/lib/lib{zstd,lz4,crypto,utf8proc,re2,aws*}.a $DST_DIR/lib/x64
cp $MSYS_LIB_DIR/mingw32/lib/lib{zstd,lz4,crypto,utf8proc,re2,aws*}.a $DST_DIR/lib/i386

# Do the same also for ucrt64
if [ "$RTOOLS_VERSION" != "35" ]; then
ls $MSYS_LIB_DIR/ucrt64/lib/
mkdir -p $DST_DIR/lib/x64-ucrt
mv ucrt64/lib/*.a $DST_DIR/${RWINLIB_LIB_DIR}/x64-ucrt
cp $MSYS_LIB_DIR/ucrt64/lib/lib{zstd,lz4,crypto,utf8proc,re2,aws*}.a $DST_DIR/lib/x64-ucrt
fi

# Create build artifact
zip -r ${DST_DIR}.zip $DST_DIR

Expand Down