Add manifest for cargo-nextest

tools/codegen/base/cargo-nextest.json

@@ -0,0 +1,17 @@
+{
+  "repository": "https://github.com/nextest-rs/nextest",
+  "tag_prefix": "cargo-nextest-",
+  "rust_crate": "${package}",
+  "asset_name": "${package}-${version}-${rust_target}.tar.gz",
+  "prefer_linux_gnu": true,
+  "immediate_yank_reflection": true,
+  "platform": {
+    "x86_64_linux_gnu": {},
+    "x86_64_linux_musl": {},
+    "x86_64_macos": {
+      "asset_name": "${package}-${version}-universal-apple-darwin.tar.gz"
+    },
+    "x86_64_windows": {},
+    "aarch64_linux_gnu": {}
+  }
+}

tools/codegen/src/lib.rs

@@ -180,6 +180,8 @@ pub enum ManifestRef {
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Manifest {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub previous_stable_version: Option<Version>,
     #[serde(flatten)]
     pub download_info: BTreeMap<HostPlatform, ManifestDownloadInfo>,
 }
@@ -229,8 +231,15 @@ pub struct BaseManifest {
     pub signing: Option<Signing>,
     #[serde(default)]
     pub broken: Vec<semver::Version>,
-    pub platform: BTreeMap<HostPlatform, BaseManifestPlatformInfo>,
     pub version_range: Option<String>,
+    /// Use glibc build if host_env is gnu.
+    #[serde(default)]
+    pub prefer_linux_gnu: bool,
+    /// Check that the version is yanked not only when updating the manifest,
+    /// but also when running the action.
+    #[serde(default)]
+    pub immediate_yank_reflection: bool,
+    pub platform: BTreeMap<HostPlatform, BaseManifestPlatformInfo>,
 }
 impl BaseManifest {
     /// Validate the manifest.

tools/codegen/src/main.rs

@@ -405,15 +405,17 @@ fn main() -> Result<()> {
         }
         // compact manifest
         // TODO: do this before download binaries
-        if download_info.contains_key(&HostPlatform::x86_64_linux_gnu)
-            && download_info.contains_key(&HostPlatform::x86_64_linux_musl)
-        {
-            download_info.remove(&HostPlatform::x86_64_linux_gnu);
-        }
-        if download_info.contains_key(&HostPlatform::aarch64_linux_gnu)
-            && download_info.contains_key(&HostPlatform::aarch64_linux_musl)
-        {
-            download_info.remove(&HostPlatform::aarch64_linux_gnu);
+        if !base_info.prefer_linux_gnu {
+            if download_info.contains_key(&HostPlatform::x86_64_linux_gnu)
+                && download_info.contains_key(&HostPlatform::x86_64_linux_musl)
+            {
+                download_info.remove(&HostPlatform::x86_64_linux_gnu);
+            }
+            if download_info.contains_key(&HostPlatform::aarch64_linux_gnu)
+                && download_info.contains_key(&HostPlatform::aarch64_linux_musl)
+            {
+                download_info.remove(&HostPlatform::aarch64_linux_gnu);
+            }
         }
         if download_info.contains_key(&HostPlatform::x86_64_macos)
             && download_info.contains_key(&HostPlatform::aarch64_macos)
@@ -427,7 +429,22 @@ fn main() -> Result<()> {
         if semver_version.pre.is_empty() {
             semver_versions.insert(semver_version.clone());
         }
-        manifests.map.insert(reverse_semver, ManifestRef::Real(Manifest { download_info }));
+        manifests.map.insert(
+            reverse_semver,
+            ManifestRef::Real(Manifest { previous_stable_version: None, download_info }),
+        );
+    }
+    if base_info.immediate_yank_reflection {
+        let mut prev: Option<&Version> = None;
+        for (Reverse(v), m) in manifests.map.iter_mut().rev() {
+            let ManifestRef::Real(m) = m else { continue };
+            if base_info.rust_crate.is_some() {
+                m.previous_stable_version = prev.cloned();
+            } else {
+                m.previous_stable_version = None;
+            }
+            prev = Some(v);
+        }
     }
     if has_build_metadata {
         eprintln!(
@@ -494,15 +511,17 @@ fn main() -> Result<()> {
         if latest_manifest.download_info.contains_key(&p) {
             continue;
         }
-        if p == HostPlatform::x86_64_linux_gnu
-            && latest_manifest.download_info.contains_key(&HostPlatform::x86_64_linux_musl)
-        {
-            continue;
-        }
-        if p == HostPlatform::aarch64_linux_gnu
-            && latest_manifest.download_info.contains_key(&HostPlatform::aarch64_linux_musl)
-        {
-            continue;
+        if !base_info.prefer_linux_gnu {
+            if p == HostPlatform::x86_64_linux_gnu
+                && latest_manifest.download_info.contains_key(&HostPlatform::x86_64_linux_musl)
+            {
+                continue;
+            }
+            if p == HostPlatform::aarch64_linux_gnu
+                && latest_manifest.download_info.contains_key(&HostPlatform::aarch64_linux_musl)
+            {
+                continue;
+            }
         }
         bail!(
             "platform list in base manifest for {package} contains {p:?}, \

tools/codegen/src/tools-markdown.rs

@@ -46,31 +46,18 @@ fn main() -> Result<()> {
         fs::read_dir(manifest_dir.clone()).unwrap().map(|r| r.unwrap()).collect();
     paths.sort_by_key(fs_err::DirEntry::path);
 
-    let mut tools = vec![
-        MarkdownEntry {
-            name: "nextest".to_string(),
-            alias: "cargo-nextest".to_string().into(),
-            website: "https://nexte.st/".to_string(),
-            installed_to: InstalledTo::Cargo,
-            installed_from: InstalledFrom::Binstall,
-            platforms: Platforms::all(),
-            repository: "https://github.com/nextest-rs/nextest".to_string(),
-            license_markdown: "[Apache-2.0](https://github.com/nextest-rs/nextest/blob/HEAD/LICENSE-APACHE) OR [MIT](https://github.com/nextest-rs/nextest/blob/HEAD/LICENSE-MIT)".to_string()
-        },
-        MarkdownEntry {
-            name: "valgrind".to_string(),
-            alias: None,
-            website: "https://valgrind.org/".to_string(),
-            installed_to: InstalledTo::Snap,
-            installed_from: InstalledFrom::Snap,
-            platforms: Platforms {
-                linux: true,
-                ..Default::default()
-            },
-            repository: "https://sourceware.org/git/valgrind.git".to_string(),
-            license_markdown: "[GPL-2.0](https://sourceware.org/git/?p=valgrind.git;a=blob;f=COPYING;hb=HEAD)".to_string()
-        }
-    ];
+    let mut tools = vec![MarkdownEntry {
+        name: "valgrind".to_string(),
+        alias: None,
+        website: "https://valgrind.org/".to_string(),
+        installed_to: InstalledTo::Snap,
+        installed_from: InstalledFrom::Snap,
+        platforms: Platforms { linux: true, ..Default::default() },
+        repository: "https://sourceware.org/git/valgrind.git".to_string(),
+        license_markdown:
+            "[GPL-2.0](https://sourceware.org/git/?p=valgrind.git;a=blob;f=COPYING;hb=HEAD)"
+                .to_string(),
+    }];
 
     for path in paths {
         let file_name = path.file_name();
@@ -152,7 +139,6 @@ struct MarkdownEntry {
 
 #[derive(Debug, Eq, PartialEq)]
 enum InstalledFrom {
-    Binstall,
     GitHubRelease,
     Snap,
 }
@@ -163,11 +149,6 @@ struct Platforms {
     macos: bool,
     windows: bool,
 }
-impl Platforms {
-    fn all() -> Self {
-        Self { linux: true, macos: true, windows: true }
-    }
-}
 
 impl fmt::Display for Platforms {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -223,7 +204,6 @@ impl fmt::Display for MarkdownEntry {
                 let markdown = format!("| [GitHub Releases]({}/releases) ", self.repository);
                 f.write_str(&markdown)?;
             }
-            InstalledFrom::Binstall => f.write_str("| `cargo-binstall` ")?,
             InstalledFrom::Snap => {
                 let markdown =
                     format!("| [snap](https://snapcraft.io/install/{}/ubuntu) ", self.name);