From ebb18707baf3a81fcd235a2401252031f6ab2d58 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Wed, 7 Oct 2020 10:21:59 +0900 Subject: [PATCH 1/8] [CI][Windows] Use sf.net mirror for MSYS2 Because repo.msys2.org is still down. --- ci/scripts/msys2_system_upgrade_phase1.sh | 5 ++++- ci/scripts/r_windows_build.sh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ci/scripts/msys2_system_upgrade_phase1.sh b/ci/scripts/msys2_system_upgrade_phase1.sh index 0839228f419..aecd3089332 100755 --- a/ci/scripts/msys2_system_upgrade_phase1.sh +++ b/ci/scripts/msys2_system_upgrade_phase1.sh @@ -20,6 +20,9 @@ set -eux # https://www.msys2.org/news/#2020-06-29-new-packagers +msys2_repo_base_url=https://repo.msys2.org/msys +# Mirror +msys2_repo_base_url=https://sourceforge.net/projects/msys2/files/REPOS/MSYS2 msys2_keyring_pkg=msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz for suffix in "" ".sig"; do curl \ @@ -27,7 +30,7 @@ for suffix in "" ".sig"; do --remote-name \ --show-error \ --silent \ - https://repo.msys2.org/msys/x86_64/${msys2_keyring_pkg}${suffix} + ${msys2_repo_base_url}/x86_64/${msys2_keyring_pkg}${suffix} done pacman-key --verify ${msys2_keyring_pkg}.sig pacman \ diff --git a/ci/scripts/r_windows_build.sh b/ci/scripts/r_windows_build.sh index b084975fb12..6cf9c679baf 100755 --- a/ci/scripts/r_windows_build.sh +++ b/ci/scripts/r_windows_build.sh @@ -27,7 +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 - curl -OSsl "http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz" + msys2_repo_base_url=https://repo.msys2.org/msys + # Mirror + msys2_repo_base_url=https://sourceforge.net/projects/msys2/files/REPOS/MSYS2 + 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 pacman --noconfirm -Syy From 58e26394c67a9a73e986c2e0072c746a0f2e44f0 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Wed, 7 Oct 2020 10:38:07 +0900 Subject: [PATCH 2/8] Fix curl option to support redirect --- ci/scripts/r_windows_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/scripts/r_windows_build.sh b/ci/scripts/r_windows_build.sh index 6cf9c679baf..74fb7504ecb 100755 --- a/ci/scripts/r_windows_build.sh +++ b/ci/scripts/r_windows_build.sh @@ -30,7 +30,7 @@ if [ "$RTOOLS_VERSION" = "35" ]; then msys2_repo_base_url=https://repo.msys2.org/msys # Mirror msys2_repo_base_url=https://sourceforge.net/projects/msys2/files/REPOS/MSYS2 - curl -OSsl "${msys2_repo_base_url}/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz" + 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 pacman --noconfirm -Syy From ed9d2405682bf8189204338b26e18064f137d3f8 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Wed, 7 Oct 2020 10:48:14 +0900 Subject: [PATCH 3/8] Debug --- ci/scripts/r_windows_build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/scripts/r_windows_build.sh b/ci/scripts/r_windows_build.sh index 74fb7504ecb..2b2e245b443 100755 --- a/ci/scripts/r_windows_build.sh +++ b/ci/scripts/r_windows_build.sh @@ -32,6 +32,7 @@ if [ "$RTOOLS_VERSION" = "35" ]; then msys2_repo_base_url=https://sourceforge.net/projects/msys2/files/REPOS/MSYS2 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 + cat /etc/pacman.d/mirrorlist.msys pacman --noconfirm -Scc pacman --noconfirm -Syy # lib-4.9.3 is for libraries compiled with gcc 4.9 (Rtools 3.5) From 0243ca811171165dad420523801c274f0caea03a Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Wed, 7 Oct 2020 11:18:27 +0900 Subject: [PATCH 4/8] Disable http://repo.msys2.org/ temporary --- ci/scripts/r_windows_build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/scripts/r_windows_build.sh b/ci/scripts/r_windows_build.sh index 2b2e245b443..d3b54867234 100755 --- a/ci/scripts/r_windows_build.sh +++ b/ci/scripts/r_windows_build.sh @@ -32,7 +32,9 @@ if [ "$RTOOLS_VERSION" = "35" ]; then msys2_repo_base_url=https://sourceforge.net/projects/msys2/files/REPOS/MSYS2 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 - cat /etc/pacman.d/mirrorlist.msys + # Disable http://repo.msys2.org/ temporary. + sed -i -e 's,^\(Server = http://repo.msys2.org\)/,#\1,g' \ + /etc/pacman.d/mirrorlist.* pacman --noconfirm -Scc pacman --noconfirm -Syy # lib-4.9.3 is for libraries compiled with gcc 4.9 (Rtools 3.5) From 7e6f03e8e101b321276718d9801534c705c665ad Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Wed, 7 Oct 2020 11:40:04 +0900 Subject: [PATCH 5/8] Debug --- ci/scripts/r_windows_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/scripts/r_windows_build.sh b/ci/scripts/r_windows_build.sh index d3b54867234..265f66e891f 100755 --- a/ci/scripts/r_windows_build.sh +++ b/ci/scripts/r_windows_build.sh @@ -36,7 +36,7 @@ if [ "$RTOOLS_VERSION" = "35" ]; then sed -i -e 's,^\(Server = http://repo.msys2.org\)/,#\1,g' \ /etc/pacman.d/mirrorlist.* pacman --noconfirm -Scc - pacman --noconfirm -Syy + pacman --noconfirm -Syy --verbose --debug # lib-4.9.3 is for libraries compiled with gcc 4.9 (Rtools 3.5) RWINLIB_LIB_DIR="lib-4.9.3" else From 0d7bc673f384be3b1da7f234184e528e520a0e9f Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Wed, 7 Oct 2020 12:24:49 +0900 Subject: [PATCH 6/8] Debug --- ci/scripts/r_windows_build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/scripts/r_windows_build.sh b/ci/scripts/r_windows_build.sh index 265f66e891f..71757cab53a 100755 --- a/ci/scripts/r_windows_build.sh +++ b/ci/scripts/r_windows_build.sh @@ -35,6 +35,8 @@ if [ "$RTOOLS_VERSION" = "35" ]; then # Disable http://repo.msys2.org/ temporary. sed -i -e 's,^\(Server = http://repo.msys2.org\)/,#\1,g' \ /etc/pacman.d/mirrorlist.* + cat /etc/pacman.d/mirrorlist.* + cat /etc/pacman.conf pacman --noconfirm -Scc pacman --noconfirm -Syy --verbose --debug # lib-4.9.3 is for libraries compiled with gcc 4.9 (Rtools 3.5) From 66e1b0ba507288ecfac866a811a72a79be1533d4 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Wed, 7 Oct 2020 13:50:50 +0900 Subject: [PATCH 7/8] /etc/pacman.d/mirrorlist.* aren't used --- ci/scripts/r_windows_build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ci/scripts/r_windows_build.sh b/ci/scripts/r_windows_build.sh index 71757cab53a..7da6db32b23 100755 --- a/ci/scripts/r_windows_build.sh +++ b/ci/scripts/r_windows_build.sh @@ -33,9 +33,8 @@ if [ "$RTOOLS_VERSION" = "35" ]; then 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 # Disable http://repo.msys2.org/ temporary. - sed -i -e 's,^\(Server = http://repo.msys2.org\)/,#\1,g' \ - /etc/pacman.d/mirrorlist.* - cat /etc/pacman.d/mirrorlist.* + sed -i -e "s,^Server = http://repo\.msys2\.org/msys,Server = ${msys2_repo_base_url},g" \ + /etc/pacman.conf cat /etc/pacman.conf pacman --noconfirm -Scc pacman --noconfirm -Syy --verbose --debug From ee8a3754ab6536bfc6ac76749f2ae65bd6e7ffaf Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Wed, 7 Oct 2020 15:06:12 +0900 Subject: [PATCH 8/8] Remove debug prints --- ci/scripts/r_windows_build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ci/scripts/r_windows_build.sh b/ci/scripts/r_windows_build.sh index 7da6db32b23..cb33e676a7d 100755 --- a/ci/scripts/r_windows_build.sh +++ b/ci/scripts/r_windows_build.sh @@ -32,12 +32,11 @@ if [ "$RTOOLS_VERSION" = "35" ]; then msys2_repo_base_url=https://sourceforge.net/projects/msys2/files/REPOS/MSYS2 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 - # Disable http://repo.msys2.org/ temporary. + # Use sf.net instead of http://repo.msys2.org/ temporary. sed -i -e "s,^Server = http://repo\.msys2\.org/msys,Server = ${msys2_repo_base_url},g" \ /etc/pacman.conf - cat /etc/pacman.conf pacman --noconfirm -Scc - pacman --noconfirm -Syy --verbose --debug + 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" else