From a412880d8f379e0fd72283929a7cfc53f9d6abad Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Wed, 6 Oct 2021 08:40:45 -0400 Subject: [PATCH 1/2] Switch to our own mirror of libisl --- .../docker/host-x86_64/dist-arm-linux/arm-linux-gnueabi.config | 2 +- .../host-x86_64/dist-armhf-linux/arm-linux-gnueabihf.config | 2 +- .../host-x86_64/dist-armv7-linux/armv7-linux-gnueabihf.config | 2 +- .../dist-riscv64-linux/riscv64-unknown-linux-gnu.config | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ci/docker/host-x86_64/dist-arm-linux/arm-linux-gnueabi.config b/src/ci/docker/host-x86_64/dist-arm-linux/arm-linux-gnueabi.config index acdf9a0e04185..e047db92652c2 100644 --- a/src/ci/docker/host-x86_64/dist-arm-linux/arm-linux-gnueabi.config +++ b/src/ci/docker/host-x86_64/dist-arm-linux/arm-linux-gnueabi.config @@ -611,7 +611,7 @@ CT_ISL_V_0_20=y # CT_ISL_V_0_15 is not set # CT_ISL_NO_VERSIONS is not set CT_ISL_VERSION="0.20" -CT_ISL_MIRRORS="http://isl.gforge.inria.fr" +CT_ISL_MIRRORS="https://ci-mirrors.rust-lang.org/rustc" CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" diff --git a/src/ci/docker/host-x86_64/dist-armhf-linux/arm-linux-gnueabihf.config b/src/ci/docker/host-x86_64/dist-armhf-linux/arm-linux-gnueabihf.config index 69f86663ec21b..e6a118f624158 100644 --- a/src/ci/docker/host-x86_64/dist-armhf-linux/arm-linux-gnueabihf.config +++ b/src/ci/docker/host-x86_64/dist-armhf-linux/arm-linux-gnueabihf.config @@ -625,7 +625,7 @@ CT_ISL_V_0_20=y # CT_ISL_V_0_15 is not set # CT_ISL_NO_VERSIONS is not set CT_ISL_VERSION="0.20" -CT_ISL_MIRRORS="http://isl.gforge.inria.fr" +CT_ISL_MIRRORS="https://ci-mirrors.rust-lang.org/rustc" CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" diff --git a/src/ci/docker/host-x86_64/dist-armv7-linux/armv7-linux-gnueabihf.config b/src/ci/docker/host-x86_64/dist-armv7-linux/armv7-linux-gnueabihf.config index e3d032fc7e8fc..de7da9b2733fa 100644 --- a/src/ci/docker/host-x86_64/dist-armv7-linux/armv7-linux-gnueabihf.config +++ b/src/ci/docker/host-x86_64/dist-armv7-linux/armv7-linux-gnueabihf.config @@ -612,7 +612,7 @@ CT_ISL_V_0_20=y # CT_ISL_V_0_15 is not set # CT_ISL_NO_VERSIONS is not set CT_ISL_VERSION="0.20" -CT_ISL_MIRRORS="http://isl.gforge.inria.fr" +CT_ISL_MIRRORS="https://ci-mirrors.rust-lang.org/rustc" CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" diff --git a/src/ci/docker/host-x86_64/dist-riscv64-linux/riscv64-unknown-linux-gnu.config b/src/ci/docker/host-x86_64/dist-riscv64-linux/riscv64-unknown-linux-gnu.config index 45d5ff756cdca..7400a8a038d0c 100644 --- a/src/ci/docker/host-x86_64/dist-riscv64-linux/riscv64-unknown-linux-gnu.config +++ b/src/ci/docker/host-x86_64/dist-riscv64-linux/riscv64-unknown-linux-gnu.config @@ -722,7 +722,7 @@ CT_ISL_V_0_20=y # CT_ISL_V_0_15 is not set # CT_ISL_NO_VERSIONS is not set CT_ISL_VERSION="0.20" -CT_ISL_MIRRORS="http://isl.gforge.inria.fr" +CT_ISL_MIRRORS="https://ci-mirrors.rust-lang.org/rustc" CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" From 585929289914362014411cec818978e5e958c4c4 Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Wed, 6 Oct 2021 09:57:42 -0400 Subject: [PATCH 2/2] wip logs --- .../host-x86_64/dist-armhf-linux/arm-linux-gnueabihf.config | 6 +++++- .../docker/host-x86_64/dist-armhf-linux/build-toolchains.sh | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ci/docker/host-x86_64/dist-armhf-linux/arm-linux-gnueabihf.config b/src/ci/docker/host-x86_64/dist-armhf-linux/arm-linux-gnueabihf.config index e6a118f624158..65c252db057c4 100644 --- a/src/ci/docker/host-x86_64/dist-armhf-linux/arm-linux-gnueabihf.config +++ b/src/ci/docker/host-x86_64/dist-armhf-linux/arm-linux-gnueabihf.config @@ -65,6 +65,8 @@ CT_CONNECT_TIMEOUT=10 CT_DOWNLOAD_WGET_OPTIONS="--passive-ftp --tries=3 -nc --progress=dot:binary" # CT_ONLY_DOWNLOAD is not set # CT_USE_MIRROR is not set +CT_USE_MIRROR=y +CT_MIRROR_BASE_URL=https://ci-mirrors.rust-lang.org/rustc CT_VERIFY_DOWNLOAD_DIGEST=y CT_VERIFY_DOWNLOAD_DIGEST_SHA512=y # CT_VERIFY_DOWNLOAD_DIGEST_SHA256 is not set @@ -105,11 +107,13 @@ CT_CONFIG_SHELL="${bash}" # CT_LOG_ERROR is not set # CT_LOG_WARN is not set # CT_LOG_INFO is not set -CT_LOG_EXTRA=y +# CT_LOG_EXTRA=y # CT_LOG_ALL is not set # CT_LOG_DEBUG is not set CT_LOG_LEVEL_MAX="EXTRA" +CT_LOG_DEBUG=y # CT_LOG_SEE_TOOLS_WARN is not set +CT_LOG_SEE_TOOLS_WARN=y CT_LOG_PROGRESS_BAR=y CT_LOG_TO_FILE=y CT_LOG_FILE_COMPRESS=y diff --git a/src/ci/docker/host-x86_64/dist-armhf-linux/build-toolchains.sh b/src/ci/docker/host-x86_64/dist-armhf-linux/build-toolchains.sh index f425efd6057c6..ccf6e26d057e7 100755 --- a/src/ci/docker/host-x86_64/dist-armhf-linux/build-toolchains.sh +++ b/src/ci/docker/host-x86_64/dist-armhf-linux/build-toolchains.sh @@ -23,6 +23,6 @@ mkdir build cd build cp ../arm-linux-gnueabihf.config .config ct-ng oldconfig -hide_output ct-ng build +ct-ng build cd .. rm -rf build