Recompress after pruning

Author: Mark-Simulacrum

src/main.rs

@@ -161,8 +161,6 @@ impl Context {
         // to do. This represents a scenario where changes have been merged to
         // the stable/beta branch but the version bump hasn't happened yet.
         self.download_artifacts(&rev)?;
-        // Generate recompressed artifacts from the input set.
-        self.recompress(&self.dl_dir())?;
         // The bypass_startup_checks condition is after the function call since we need that
         // function to run even if we wan to discard its output (it fetches and stores the current
         // version we're about to release).
@@ -181,10 +179,22 @@ impl Context {
         let build_manifest = BuildManifest::new(self)?;
         let smoke_test = SmokeTester::new(&[self.smoke_manifest_dir(), self.dl_dir()])?;
 
-        // First of all, the real manifests are generated, pointing to the public download
-        // endpoint. This will also collect the list of files shipped in the release (used
-        // later to prune the files we're not shipping) and a cache of all the checksums
-        // generated by build-manifest.
+        // This step is just a discovery of unused files so we can prune them prior to
+        // recompression...
+        let execution = build_manifest.run(
+            &format!("{}/{}", self.config.upload_addr, self.config.upload_dir),
+            &self.real_manifest_dir(),
+        )?;
+
+        // Removes files that we are not shipping from the files we're about to upload.
+        self.prune_unused_files(&execution.shipped_files)?;
+
+        // Generate recompressed artifacts from the input set. This invalidates signatures etc
+        // produced in the earlier step so we'll need to re-run the manifest building.
+        self.recompress(&self.dl_dir())?;
+
+        // Now generate the real manifests, pointing to the public download endpoint. This will
+        // also generate a cache of all the checksums generated by build-manifest.
         let execution = build_manifest.run(
             &format!("{}/{}", self.config.upload_addr, self.config.upload_dir),
             &self.real_manifest_dir(),
@@ -197,9 +207,6 @@ impl Context {
             &self.smoke_manifest_dir(),
         )?;
 
-        // Removes files that we are not shipping from the files we're about to upload.
-        self.prune_unused_files(&execution.shipped_files)?;
-
         // Sign both the downloaded artifacts and all the generated manifests. The signatures
         // of the downloaded files and the real manifests are permanent, while the signatures
         // for the smoke test manifests will be discarded later.