Remove windows-2019, set ubuntu-22.04 as default and fix installer URLs

Cargo.toml

@@ -18,13 +18,13 @@ edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/oxidecomputer/cargo-dist"
 homepage = "https://opensource.axo.dev/cargo-dist/"
-version = "1.0.0-rc.1"
+version = "1.0.0-rc.2"
 rust-version = "1.74"
 
 [workspace.dependencies]
 # intra-workspace deps (you need to bump these versions when you cut releases too!
-dist-schema = { version = "=1.0.0-rc.1", path = "cargo-dist-schema" }
-axoproject = { version = "=1.0.0-rc.1", path = "axoproject", default-features = false, features = ["cargo-projects", "generic-projects", "npm-projects"] }
+dist-schema = { version = "=1.0.0-rc.2", path = "cargo-dist-schema" }
+axoproject = { version = "=1.0.0-rc.2", path = "axoproject", default-features = false, features = ["cargo-projects", "generic-projects", "npm-projects"] }
 
 # vendored first-party deps
 axocli = { version = "0.2.0", path = "vendor/axocli" }

cargo-dist/src/backend/ci/github.rs

@@ -659,14 +659,14 @@ fn github_runner_for_target(
     // where random system dependencies can creep in and be very
     // recent. This helps with portability!
     let result = Some(match target_triple.operating_system {
-        OperatingSystem::Linux => runner_to_config(GithubRunnerRef::from_str("ubuntu-24.04")),
+        OperatingSystem::Linux => runner_to_config(GithubRunnerRef::from_str("ubuntu-22.04")),
         OperatingSystem::Darwin => runner_to_config(GithubRunnerRef::from_str("macos-13")),
         OperatingSystem::Windows => {
             // Default to cargo-xwin for Windows cross-compiles
             if target_triple.architecture != Architecture::X86_64 {
                 cargo_xwin()
             } else {
-                runner_to_config(GithubRunnerRef::from_str("windows-2019"))
+                runner_to_config(GithubRunnerRef::from_str("windows-2022"))
             }
         }
         _ => return Ok(None),

cargo-dist/src/backend/ci/mod.rs

@@ -98,7 +98,7 @@ impl DistInstallSettings<'_> {
         if let Some(url) = self.url_override.as_ref() {
             return DistInstallStrategy::Installer {
                 installer_url: url.as_str().to_owned(),
-                installer_name: "cargo-dist-installer".to_owned(),
+                installer_name: "dist-installer".to_owned(),
             };
         }
 
@@ -110,7 +110,7 @@ impl DistInstallSettings<'_> {
         } else if format.artifact_names_contain_versions() {
             format!("cargo-dist-v{version}-installer")
         } else {
-            "cargo-dist-installer".to_owned()
+            "dist-installer".to_owned()
         };
 
         DistInstallStrategy::Installer {

cargo-dist/src/platform/github_runners.rs

@@ -13,19 +13,16 @@ lazy_static::lazy_static! {
         // last updated 2024-10-25
 
         //-------- linux
-        m.insert(GithubRunnerRef::from_str("ubuntu-20.04"), t::TARGET_X64_LINUX_GNU);
         m.insert(GithubRunnerRef::from_str("ubuntu-22.04"), t::TARGET_X64_LINUX_GNU);
         m.insert(GithubRunnerRef::from_str("ubuntu-24.04"), t::TARGET_X64_LINUX_GNU);
         m.insert(GithubRunnerRef::from_str("ubuntu-latest"), t::TARGET_X64_LINUX_GNU);
 
         //-------- windows
-        m.insert(GithubRunnerRef::from_str("windows-2019"), t::TARGET_X64_WINDOWS);
         m.insert(GithubRunnerRef::from_str("windows-2022"), t::TARGET_X64_WINDOWS);
+        m.insert(GithubRunnerRef::from_str("windows-2025"), t::TARGET_X64_WINDOWS);
         m.insert(GithubRunnerRef::from_str("windows-latest"), t::TARGET_X64_WINDOWS);
 
         //-------- macos x64
-        m.insert(GithubRunnerRef::from_str("macos-12"), t::TARGET_X64_MAC); // deprecated
-        m.insert(GithubRunnerRef::from_str("macos-12-large"), t::TARGET_X64_MAC);
         m.insert(GithubRunnerRef::from_str("macos-13"), t::TARGET_X64_MAC);
         m.insert(GithubRunnerRef::from_str("macos-13-large"), t::TARGET_X64_MAC);
         m.insert(GithubRunnerRef::from_str("macos-14-large"), t::TARGET_X64_MAC);
@@ -91,7 +88,7 @@ mod tests {
     #[test]
     fn test_target_for_github_runner() {
         assert_eq!(
-            target_for_github_runner(GithubRunnerRef::from_str("ubuntu-20.04")),
+            target_for_github_runner(GithubRunnerRef::from_str("ubuntu-22.04")),
             Some(t::TARGET_X64_LINUX_GNU)
         );
         assert_eq!(

cargo-dist/tests/cli-tests.rs

@@ -234,7 +234,7 @@ fn generate_installer(version: &axotag::Version, release_type: ReleaseSourceType
         .unwrap()
         .join("target")
         .join("distrib")
-        .join(format!("cargo-dist-installer{ext}"));
+        .join(format!("dist-installer{ext}"));
     let installer_string = std::fs::read_to_string(&installer_path).unwrap();
 
     let installer_url = match release_type {