Merge pull request #69 from Mark-Simulacrum/tag-cargo

Automate Cargo tagging

Author: pietroalbini

src/config.rs

@@ -152,6 +152,14 @@ pub(crate) struct Config {
     /// Should be a org/repo code, e.g., rust-lang/rust.
     pub(crate) rustc_tag_repository: Option<String>,
 
+    /// Where to tag stable cargo releases.
+    ///
+    /// This repository should have content write permissions with the github
+    /// app configuration.
+    ///
+    /// Should be a org/repo code, e.g., rust-lang/cargo.
+    pub(crate) cargo_tag_repository: Option<String>,
+
     /// Where to publish new blog PRs.
     ///
     /// We create a new PR announcing releases in this repository; currently we
@@ -228,6 +236,7 @@ impl Config {
             recompress_xz: bool_env("RECOMPRESS_XZ")?,
             recompress_gz: bool_env("RECOMPRESS_GZ")?,
             rustc_tag_repository: maybe_env("RUSTC_TAG_REPOSITORY")?,
+            cargo_tag_repository: maybe_env("CARGO_TAG_REPOSITORY")?,
             blog_repository: maybe_env("BLOG_REPOSITORY")?,
             blog_pr: maybe_env("BLOG_MERGE_PR")?,
             scheduled_release_date: maybe_env("BLOG_SCHEDULED_RELEASE_DATE")?,

src/main.rs

@@ -38,6 +38,7 @@ struct Context {
     config: Config,
     date: String,
     current_version: Option<String>,
+    current_cargo_version: Option<String>,
 }
 
 // Called as:
@@ -66,6 +67,7 @@ impl Context {
             date,
             handle: Easy::new(),
             current_version: None,
+            current_cargo_version: None,
         })
     }
 
@@ -262,18 +264,12 @@ impl Context {
         Ok(())
     }
 
-    fn current_version_same(&mut self, prev: &str) -> Result<bool, Error> {
-        // nightly's always changing
-        if self.config.channel == Channel::Nightly {
-            return Ok(false);
-        }
-        let prev_version = prev.split(' ').next().unwrap();
-
+    fn load_version(&mut self, mut filter: impl FnMut(&str) -> bool) -> Result<String, Error> {
         let mut current = None;
         for e in self.dl_dir().read_dir()? {
             let e = e?;
             let filename = e.file_name().into_string().unwrap();
-            if !filename.starts_with("rustc-") || !filename.ends_with(".tar.xz") {
+            if !filter(&filename) && filename.ends_with(".tar.xz") {
                 continue;
             }
             println!("looking inside {} for a version", filename);
@@ -301,13 +297,26 @@ impl Context {
                 break;
             }
         }
-        let current = current.ok_or_else(|| anyhow::anyhow!("no archives with a version"))?;
+        current.ok_or_else(|| anyhow::anyhow!("no archives with a version"))
+    }
 
-        println!("current version: {}", current);
+    fn current_version_same(&mut self, prev: &str) -> Result<bool, Error> {
+        // nightly's always changing
+        if self.config.channel == Channel::Nightly {
+            return Ok(false);
+        }
+        let prev_version = prev.split(' ').next().unwrap();
 
+        let current = self.load_version(|filename| filename.starts_with("rustc-"))?;
+        println!("current version: {}", current);
         let current_version = current.split(' ').next().unwrap();
         self.current_version = Some(current_version.to_string());
 
+        let current_cargo = self.load_version(|filename| filename.starts_with("cargo-"))?;
+        println!("current cargo version: {}", current_cargo);
+        let current_version = current_cargo.split(' ').next().unwrap();
+        self.current_cargo_version = Some(current_cargo.to_string());
+
         // The release process for beta looks like so:
         //
         // * Force push master branch to beta branch
@@ -644,13 +653,43 @@ impl Context {
             return Ok(());
         };
 
-        if let Some(repo) = self.config.rustc_tag_repository.clone() {
-            self.tag_repository(signer, &mut github, &repo, rustc_commit)?;
+        if let Some(rustc_repo) = self.config.rustc_tag_repository.clone() {
+            let rustc_version = self.current_version.clone().expect("has current version");
+            self.tag_repository(
+                signer,
+                &mut github,
+                &rustc_repo,
+                rustc_commit,
+                &rustc_version,
+            )?;
 
             // Once we've tagged rustc, kick off a thanks workflow run.
             github
                 .token("rust-lang/thanks")?
                 .workflow_dispatch("ci.yml", "master")?;
+
+            if let Some(cargo_repo) = self.config.cargo_tag_repository.clone() {
+                let cargo_version = self
+                    .current_cargo_version
+                    .clone()
+                    .expect("has current cargo version");
+                let cargo_commit = match github
+                    .token(&rustc_repo)?
+                    .read_file(Some(rustc_commit), "src/tools/cargo")?
+                {
+                    github::GitFile::Submodule { sha } => sha,
+                    github::GitFile::File { .. } => {
+                        anyhow::bail!("src/tools/cargo is expected to be a submodule")
+                    }
+                };
+                self.tag_repository(
+                    signer,
+                    &mut github,
+                    &cargo_repo,
+                    &cargo_commit,
+                    &cargo_version,
+                )?;
+            }
         }
 
         Ok(())
@@ -662,8 +701,8 @@ impl Context {
         github: &mut Github,
         repository: &str,
         commit: &str,
+        version: &str,
     ) -> Result<(), Error> {
-        let version = self.current_version.as_ref().expect("has current version");
         let tag_name = version.to_owned();
         let username = "rust-lang/promote-release";
         let email = "release-team@rust-lang.org";