fix release flow regressions

Author: Thanga-Ganapathy

crates/adapters/src/generic.rs

@@ -161,9 +161,22 @@ impl Adapter for GenericAdapter {
         Bump::Patch
     }
 
-    fn is_published(&self, _pkg: &Pkg, _version: &str) -> Result<bool> {
-        // No registry API to query; rely on the dated changelog / tag for idempotency upstream.
-        Ok(false)
+    fn is_published(&self, pkg: &Pkg, version: &str) -> Result<bool> {
+        // No generic registry API exists, so use the tag created after a successful publish as
+        // the resumability marker.
+        let tag = format!("{}@{}", pkg.name, version);
+        let out = Command::new("git")
+            .args(["tag", "--list", &tag])
+            .current_dir(&self.root)
+            .output()
+            .with_context(|| format!("checking for release tag: {tag}"))?;
+        if !out.status.success() {
+            bail!(
+                "`git tag --list {tag}` failed:\n{}",
+                String::from_utf8_lossy(&out.stderr)
+            );
+        }
+        Ok(!String::from_utf8_lossy(&out.stdout).trim().is_empty())
     }
 
     fn publish(&self, pkg: &Pkg, _staged_assets: Option<&Path>) -> Result<()> {
@@ -253,4 +266,46 @@ mod tests {
         let p = a.discover_packages().unwrap().pop().unwrap();
         assert!(a.publish(&p, None).is_err());
     }
+
+    #[test]
+    fn is_published_uses_existing_release_tag() {
+        let tmp = tempfile::tempdir().unwrap();
+        std::fs::write(tmp.path().join("deno.json"), "{\"version\":\"1.0.0\"}").unwrap();
+        std::process::Command::new("git")
+            .args(["init", "-q"])
+            .current_dir(tmp.path())
+            .status()
+            .unwrap();
+        std::process::Command::new("git")
+            .args(["config", "user.email", "t@t"])
+            .current_dir(tmp.path())
+            .status()
+            .unwrap();
+        std::process::Command::new("git")
+            .args(["config", "user.name", "Test"])
+            .current_dir(tmp.path())
+            .status()
+            .unwrap();
+        std::process::Command::new("git")
+            .args(["add", "-A"])
+            .current_dir(tmp.path())
+            .status()
+            .unwrap();
+        std::process::Command::new("git")
+            .args(["commit", "-q", "-m", "init"])
+            .current_dir(tmp.path())
+            .status()
+            .unwrap();
+
+        let a = GenericAdapter::new(tmp.path(), vec![pkg("lib", "deno.json", Some("true"))]);
+        let p = a.discover_packages().unwrap().pop().unwrap();
+        assert!(!a.is_published(&p, "1.0.0").unwrap());
+
+        std::process::Command::new("git")
+            .args(["tag", "lib@1.0.0"])
+            .current_dir(tmp.path())
+            .status()
+            .unwrap();
+        assert!(a.is_published(&p, "1.0.0").unwrap());
+    }
 }

crates/cli/src/main.rs

@@ -170,10 +170,14 @@ fn main() -> Result<()> {
                 first_release,
                 skip_pr: false,
             };
-            for eco in &config.adapters {
-                let adapter = factory.make(*eco);
-                version::run(adapter.as_ref(), &root, &opts, &config)?;
-            }
+            let adapters: Vec<Box<dyn Adapter>> = config
+                .adapters
+                .iter()
+                .map(|eco| factory.make(*eco))
+                .collect();
+            let adapter_refs: Vec<&dyn Adapter> =
+                adapters.iter().map(|adapter| adapter.as_ref()).collect();
+            version::run_many(&adapter_refs, &root, &opts, &config)?;
             Ok(())
         }
 

crates/cli/tests/e2e.rs

@@ -15,7 +15,7 @@ use anyhow::Result;
 
 use otf_release_adapters::npm::{CommandOutput, CommandRunner, NpmAdapter};
 use otf_release_core::adapter::{Bump, Pkg};
-use otf_release_core::config::{Hooks, ReleaseConfig};
+use otf_release_core::config::ReleaseConfig;
 use otf_release_core::forge::Forge;
 use otf_release_core::git::GitRepo;
 use otf_release_core::prompt::Prompt;

crates/cli/tests/version_flow.rs

@@ -16,7 +16,7 @@ use otf_release_core::forge::Forge;
 use otf_release_core::git::GitRepo;
 use otf_release_core::prompt::Prompt;
 use otf_release_core::version::{orchestrate, VersionOptions};
-use otf_release_core::config::{Hooks, ReleaseConfig};
+use otf_release_core::config::ReleaseConfig;
 
 /// Every `npm` invocation "succeeds" (the version flow only calls `update_lockfile`).
 struct OkRunner;

crates/core/src/init.rs

@@ -302,7 +302,7 @@ pub fn render_workflow(config: &ReleaseConfig) -> String {
         s.push_str("\npermissions:\n  contents: write  # create tags and GitHub Releases\n");
     }
     s.push_str("\njobs:\n");
-    let version_cmd = version_read_cmd(config.packages.first());
+    let version_cmd = version_read_cmd(config);
     render_check_release_job(&mut s, &version_cmd);
 
     // Build jobs only for packages that actually declare a build command.
@@ -346,8 +346,8 @@ pub fn render_workflow(config: &ReleaseConfig) -> String {
 
 /// The shell snippet that reads the release version for the GitHub Release tag, based on the
 /// first build-only package: a manifest field (generic), `package.json` (npm), or `Cargo.toml`.
-fn version_read_cmd(entry: Option<&PackageEntry>) -> String {
-    match entry {
+fn version_read_cmd(config: &ReleaseConfig) -> String {
+    match config.packages.first() {
         Some(e) if e.adapter == Ecosystem::Generic => {
             let manifest = e.manifest.as_deref().unwrap_or("deno.json");
             let field = e.version_field.as_deref().unwrap_or("version");
@@ -364,9 +364,18 @@ fn version_read_cmd(entry: Option<&PackageEntry>) -> String {
         Some(e) if e.adapter == Ecosystem::Npm => {
             "node -p \"require('./package.json').version\"".to_string()
         }
-        _ => {
+        Some(_) => {
             "cargo metadata --no-deps --format-version 1 | jq -r '.packages[0].version'".to_string()
         }
+        None if config.adapters.contains(&Ecosystem::Npm) => {
+            "node -p \"require('./package.json').version\"".to_string()
+        }
+        None if config.adapters.contains(&Ecosystem::Cargo) => {
+            "cargo metadata --no-deps --format-version 1 | jq -r '.packages[0].version'".to_string()
+        }
+        _ => {
+            "echo 0.0.0  # edit me: where the version lives".to_string()
+        }
     }
 }
 
@@ -1066,6 +1075,8 @@ mod tests {
         let out = render_workflow(&config);
         assert!(out.contains("  publish:\n"));
         assert!(out.contains("      - uses: actions/setup-node@v4\n"));
+        assert!(out.contains("          version=\"$(node -p \"require('./package.json').version\")\""));
+        assert!(!out.contains("version=\"$(cargo metadata"));
         assert!(out.contains("        run: otf-release publish\n"));
         // No build steps, so no needs and no artifact download.
         assert!(out.contains("needs: [check-release]"));

crates/core/src/snapshot.rs

@@ -5,7 +5,6 @@ use crate::adapter::Adapter;
 use crate::config::ReleaseConfig;
 use crate::publish;
 use crate::graph::Graph;
-use crate::hooks;
 use crate::git;
 
 pub fn run(adapter: &dyn Adapter, root: &Path, config: &ReleaseConfig) -> Result<()> {