From fe6c863f0bdfffaeb8fbbb520ece8696581383ce Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Mon, 4 Sep 2023 13:21:05 -0400 Subject: [PATCH] Mirror the rustc-perf source This avoids issues with the GitHub /archive/ links which can be somewhat unreliable and are currently causing CI issues. --- src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile | 2 +- src/tools/opt-dist/src/environment/windows.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile index 319989df334..f6954275ad4 100644 --- a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile @@ -60,7 +60,7 @@ ENV CC=clang CXX=clang++ # rustc-perf version from 2023-05-30 # Should also be changed in the opt-dist tool for other environments. ENV PERF_COMMIT 8b2ac3042e1ff2c0074455a0a3618adef97156b1 -RUN curl -LS -o perf.zip https://github.com/rust-lang/rustc-perf/archive/$PERF_COMMIT.zip && \ +RUN curl -LS -o perf.zip https://ci-mirrors.rust-lang.org/rustc/rustc-perf-$PERF_COMMIT.zip && \ unzip perf.zip && \ mv rustc-perf-$PERF_COMMIT rustc-perf && \ rm perf.zip diff --git a/src/tools/opt-dist/src/environment/windows.rs b/src/tools/opt-dist/src/environment/windows.rs index 8a9733d6496..67f63c7359d 100644 --- a/src/tools/opt-dist/src/environment/windows.rs +++ b/src/tools/opt-dist/src/environment/windows.rs @@ -42,7 +42,7 @@ fn prepare_rustc_perf(&self) -> anyhow::Result<()> { // rustc-perf version from 2023-05-30 const PERF_COMMIT: &str = "8b2ac3042e1ff2c0074455a0a3618adef97156b1"; - let url = format!("https://github.com/rust-lang/rustc-perf/archive/{PERF_COMMIT}.zip"); + let url = format!("https://ci-mirrors.rust-lang.org/rustc/rustc-perf-{PERF_COMMIT}.zip"); let response = reqwest::blocking::get(url)?.error_for_status()?.bytes()?.to_vec(); let mut archive = ZipArchive::new(Cursor::new(response))?;