Skip to content

Commit ff1e8d4

Browse files
Really stop recompressing to-be-pruned artifacts
This was added as a temporary measure in a226029 because otherwise build-manifest failed to read version information, which resulted in the packages getting dropped. As of the mentioned PR (rust-lang/rust#110436) this is no longer an issue, and that PR has long reached all branches. Empirically, we see in build metrics that nightly releases take around 1h50m, while beta and stable releases take above 3 hours. This is largely explained by extra recompression done in beta/stable releases today of files that subsequently are deleted in `prune_unused_files`. This also avoids having different code paths on different channels, which seems like a good win no matter what.
1 parent 79ac8d9 commit ff1e8d4

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

src/main.rs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -180,15 +180,6 @@ impl Context {
180180

181181
self.assert_all_components_present()?;
182182

183-
// Produce a full set of artifacts so that pruning works correctly.
184-
//
185-
// Nightly (1.71+) supports this upstream without the extra recompression, see
186-
// https://github.com/rust-lang/rust/pull/110436. We expect that this snippet can be fully
187-
// dropped once that PR hits stable.
188-
if self.config.channel != Channel::Nightly {
189-
self.recompress(&self.dl_dir())?;
190-
}
191-
192183
// Ok we've now determined that a release needs to be done.
193184

194185
let mut signer = Signer::new(&self.config)?;
@@ -208,9 +199,7 @@ impl Context {
208199

209200
// Generate recompressed artifacts from the input set. This invalidates signatures etc
210201
// produced in the earlier step so we'll need to re-run the manifest building.
211-
if self.config.channel == Channel::Nightly {
212-
self.recompress(&self.dl_dir())?;
213-
}
202+
self.recompress(&self.dl_dir())?;
214203

215204
// Since we recompressed, need to clear out the checksum cache.
216205
build_manifest.clear_checksum_cache()?;

0 commit comments

Comments
 (0)