You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ks...@apache.org on 2020/08/11 15:57:34 UTC
[arrow] 05/22: ARROW-9569: [CI][R] Fix rtools35 builds for msys2
key change
This is an automated email from the ASF dual-hosted git repository.
kszucs pushed a commit to branch maint-1.0.x
in repository https://gitbox.apache.org/repos/asf/arrow.git
commit e56e827d7b059981264ad6d6ec984ec5716c1c4c
Author: Neal Richardson <ne...@gmail.com>
AuthorDate: Mon Jul 27 14:57:51 2020 -0400
ARROW-9569: [CI][R] Fix rtools35 builds for msys2 key change
Following https://github.com/r-windows/rtools-packages/commit/2babb630c3e0bb9b770463aa0c5a95aa2d5a08cb#diff-fec826feae04e51c0d94076385408bdcR24-R25
Closes #7840 from nealrichardson/fix-msys-keys
Authored-by: Neal Richardson <ne...@gmail.com>
Signed-off-by: Benjamin Kietzman <be...@gmail.com>
---
ci/scripts/r_windows_build.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/ci/scripts/r_windows_build.sh b/ci/scripts/r_windows_build.sh
index eecfc20..ed9e211 100755
--- a/ci/scripts/r_windows_build.sh
+++ b/ci/scripts/r_windows_build.sh
@@ -26,6 +26,9 @@ export ARROW_HOME="$(cd "${ARROW_HOME}" && pwd)"
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
+ curl -OSsl "http://repo.msys2.org/msys/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
pacman --noconfirm -Syy
# lib-4.9.3 is for libraries compiled with gcc 4.9 (Rtools 3.5)