diff options
| author | bors <bors@rust-lang.org> | 2023-10-22 21:57:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-10-22 21:57:27 +0000 |
| commit | 913ceaee96581232cbb8eedb43224f442e0c5287 (patch) | |
| tree | efef2039bae43f10bf0ca3a1991c52ee74ea7d94 | |
| parent | 54b0434cead71e33bb4ddb52acde7767452b276d (diff) | |
| parent | 41dfebbd177b05f85ad3f737dda1fef56936c203 (diff) | |
| download | rust-913ceaee96581232cbb8eedb43224f442e0c5287.tar.gz rust-913ceaee96581232cbb8eedb43224f442e0c5287.zip | |
Auto merge of #117062 - Kobzol:update-rustc-perf, r=Mark-Simulacrum
Update rustc-perf version Needed to unblock https://github.com/rust-lang/rust/pull/116033. The commit first needs to be uploaded to our mirrors. r? `@Mark-Simulacrum`
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile | 4 | ||||
| -rw-r--r-- | src/tools/opt-dist/src/main.rs | 4 |
2 files changed, 4 insertions, 4 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 c04121a8bee..9a2fcb0ce0a 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 @@ -57,9 +57,9 @@ COPY host-x86_64/dist-x86_64-linux/build-clang.sh /tmp/ RUN ./build-clang.sh ENV CC=clang CXX=clang++ -# rustc-perf version from 2023-05-30 +# rustc-perf version from 2023-10-22 # Should also be changed in the opt-dist tool for other environments. -ENV PERF_COMMIT 8b2ac3042e1ff2c0074455a0a3618adef97156b1 +ENV PERF_COMMIT 4f313add609f43e928e98132358e8426ed3969ae 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 && \ diff --git a/src/tools/opt-dist/src/main.rs b/src/tools/opt-dist/src/main.rs index 9cdff84676e..f9ff1a0a486 100644 --- a/src/tools/opt-dist/src/main.rs +++ b/src/tools/opt-dist/src/main.rs @@ -408,8 +408,8 @@ fn download_rustc_perf(env: &Environment) -> anyhow::Result<()> { // FIXME: add some mechanism for synchronization of this commit SHA with // Linux (which builds rustc-perf in a Dockerfile) - // rustc-perf version from 2023-05-30 - const PERF_COMMIT: &str = "8b2ac3042e1ff2c0074455a0a3618adef97156b1"; + // rustc-perf version from 2023-10-22 + const PERF_COMMIT: &str = "4f313add609f43e928e98132358e8426ed3969ae"; let url = format!("https://ci-mirrors.rust-lang.org/rustc/rustc-perf-{PERF_COMMIT}.zip"); let client = reqwest::blocking::Client::builder() |