git tag in publishing script

Author: jprochazk

Cargo.toml

@@ -4,11 +4,11 @@ resolver = "2"
 
 [workspace.package]
 rust-version = "1.81"
-version = "0.21.0"
+version = "0.21.1"
 
 [workspace.dependencies]
-garde = { path = "garde", version = "=0.21.0", default-features = false }
-garde_derive = { path = "garde_derive", version = "=0.21.0", default-features = false }
+garde = { path = "garde", version = "=0.21.1", default-features = false }
+garde_derive = { path = "garde_derive", version = "=0.21.1", default-features = false }
 
 [profile.dev.package]
 insta = { opt-level = 3 }

xtask/src/main.rs

@@ -29,7 +29,7 @@ fn main() -> ExitCode {
     match try_main() {
         Ok(()) => ExitCode::SUCCESS,
         Err(e) => {
-            let _ = write!(stderr(), "{e}");
+            let _ = writeln!(stderr(), "{e}");
             ExitCode::FAILURE
         }
     }

xtask/src/task/publish.rs

@@ -1,6 +1,7 @@
 use argp::FromArgs;
 
-use crate::util::{cargo, CommandExt as _};
+use crate::util::get_workspace_manifest;
+use crate::util::{cargo, git, CommandExt as _};
 use crate::Result;
 
 #[derive(FromArgs)]
@@ -12,6 +13,18 @@ impl Publish {
         cargo("publish").with_args(["-p", "garde_derive"]).run()?;
         cargo("publish").with_args(["-p", "garde"]).run()?;
 
+        let version: semver::Version = get_workspace_manifest()?["workspace"]["package"]["version"]
+            .as_str()
+            .unwrap()
+            .parse()?;
+
+        // push tag
+        git("tag").with_arg(format!("v{}", version)).run()?;
+        git("push")
+            .with_arg("origin")
+            .with_arg(format!("v{}", version))
+            .run()?;
+
         Ok(())
     }
 }

xtask/src/task/version.rs

@@ -1,9 +1,6 @@
-use std::path::Path;
-
 use argp::FromArgs;
-use toml_edit::DocumentMut;
 
-use crate::util::{cargo, CommandExt as _};
+use crate::util::{cargo, get_workspace_manifest, get_workspace_manifest_path, CommandExt as _};
 use crate::Result;
 
 #[derive(FromArgs)]
@@ -63,12 +60,7 @@ impl argp::FromArgValue for Bump {
 
 impl Version {
     pub fn run(self) -> Result {
-        let cargo_toml_path = Path::new(env!("CARGO_MANIFEST_DIR"))
-            .parent()
-            .unwrap()
-            .join("Cargo.toml");
-        let mut cargo_toml = std::fs::read_to_string(&cargo_toml_path)?.parse::<DocumentMut>()?;
-
+        let mut cargo_toml = get_workspace_manifest()?;
         let workspace = &mut cargo_toml["workspace"];
 
         let version = workspace["package"]["version"]
@@ -106,7 +98,7 @@ impl Version {
             }
         }
 
-        std::fs::write(&cargo_toml_path, cargo_toml.to_string())?;
+        std::fs::write(get_workspace_manifest_path(), cargo_toml.to_string())?;
 
         Ok(())
     }

xtask/src/util.rs

@@ -1,13 +1,28 @@
 use std::ffi::OsStr;
 use std::path::Path;
+use std::path::PathBuf;
 use std::process::{Command, Stdio};
 
 use anyhow::anyhow;
+use toml_edit::DocumentMut;
 
 use crate::Result;
 
 pub fn project_root() -> &'static Path {
-    Path::new(env!("CARGO_MANIFEST_DIR"))
+    Path::new(env!("CARGO_MANIFEST_DIR")).parent().unwrap()
+}
+
+pub fn get_workspace_manifest_path() -> PathBuf {
+    project_root().join("Cargo.toml")
+}
+
+pub fn get_workspace_manifest() -> Result<DocumentMut> {
+    let cargo_toml_path = project_root().join("Cargo.toml");
+    Ok(std::fs::read_to_string(&cargo_toml_path)?.parse::<DocumentMut>()?)
+}
+
+pub fn git(cmd: &str) -> Command {
+    Command::new("git").with_arg(cmd)
 }
 
 pub fn rustup(cmd: &str) -> Command {