Skip to content

Commit 9db98eb

Browse files
authored
Merge pull request #105 from Mark-Simulacrum/really-skip-recompressing
Really stop recompressing to-be-pruned artifacts
2 parents 79ac8d9 + ff1e8d4 commit 9db98eb

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)