diff --git a/Cargo.lock b/Cargo.lock index 5e705b8d4..705c5ea3f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -399,7 +399,7 @@ dependencies = [ [[package]] name = "axoproject" -version = "1.0.0-rc.1" +version = "1.0.0-rc.2" dependencies = [ "axoasset", "axoprocess", @@ -1125,7 +1125,7 @@ dependencies = [ [[package]] name = "dist" -version = "1.0.0-rc.1" +version = "1.0.0-rc.2" dependencies = [ "axoasset", "axocli", @@ -1176,7 +1176,7 @@ dependencies = [ [[package]] name = "dist-schema" -version = "1.0.0-rc.1" +version = "1.0.0-rc.2" dependencies = [ "camino", "gazenot", diff --git a/Cargo.toml b/Cargo.toml index c674f59ae..fd1ce89da 100644 --- a/Cargo.toml +++ b/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" } diff --git a/cargo-dist/src/backend/ci/github.rs b/cargo-dist/src/backend/ci/github.rs index e193ce9e2..7fab6e257 100644 --- a/cargo-dist/src/backend/ci/github.rs +++ b/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), diff --git a/cargo-dist/src/backend/ci/mod.rs b/cargo-dist/src/backend/ci/mod.rs index 58c552426..c7be737b1 100644 --- a/cargo-dist/src/backend/ci/mod.rs +++ b/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 { diff --git a/cargo-dist/src/platform/github_runners.rs b/cargo-dist/src/platform/github_runners.rs index 6db867856..1fc64ef59 100644 --- a/cargo-dist/src/platform/github_runners.rs +++ b/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!( diff --git a/cargo-dist/tests/cli-tests.rs b/cargo-dist/tests/cli-tests.rs index 3e1f0d767..29e2261ed 100644 --- a/cargo-dist/tests/cli-tests.rs +++ b/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 { diff --git a/cargo-dist/tests/snapshots/akaikatana_basic.snap b/cargo-dist/tests/snapshots/akaikatana_basic.snap index bcbbaaa5b..16c08a25f 100644 --- a/cargo-dist/tests/snapshots/akaikatana_basic.snap +++ b/cargo-dist/tests/snapshots/akaikatana_basic.snap @@ -2253,7 +2253,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -2266,7 +2266,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -2275,11 +2275,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -2288,11 +2288,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -2377,7 +2377,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/akaikatana_musl.snap b/cargo-dist/tests/snapshots/akaikatana_musl.snap index 2c097a287..a7d0bb0aa 100644 --- a/cargo-dist/tests/snapshots/akaikatana_musl.snap +++ b/cargo-dist/tests/snapshots/akaikatana_musl.snap @@ -1621,7 +1621,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -1634,7 +1634,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -1643,11 +1643,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -1656,11 +1656,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-musl", "targets": [ @@ -1746,7 +1746,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/akaikatana_one_alias_among_many_binaries.snap b/cargo-dist/tests/snapshots/akaikatana_one_alias_among_many_binaries.snap index 328884cc5..2b08f6ec6 100644 --- a/cargo-dist/tests/snapshots/akaikatana_one_alias_among_many_binaries.snap +++ b/cargo-dist/tests/snapshots/akaikatana_one_alias_among_many_binaries.snap @@ -2284,7 +2284,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -2297,7 +2297,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -2306,11 +2306,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -2319,11 +2319,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -2408,7 +2408,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snap b/cargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snap index 568322b8d..f966d7698 100644 --- a/cargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snap +++ b/cargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snap @@ -2311,7 +2311,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -2324,7 +2324,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -2333,11 +2333,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -2346,11 +2346,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -2435,7 +2435,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/akaikatana_updaters.snap b/cargo-dist/tests/snapshots/akaikatana_updaters.snap index 4a2a376fd..f74767709 100644 --- a/cargo-dist/tests/snapshots/akaikatana_updaters.snap +++ b/cargo-dist/tests/snapshots/akaikatana_updaters.snap @@ -2297,7 +2297,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -2310,7 +2310,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -2319,11 +2319,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -2332,11 +2332,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -2421,7 +2421,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_abyss.snap b/cargo-dist/tests/snapshots/axolotlsay_abyss.snap index 0873ac4d1..0a7518349 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_abyss.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_abyss.snap @@ -3844,7 +3844,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -3857,7 +3857,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -3866,11 +3866,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -3879,11 +3879,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -3971,7 +3971,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_abyss_only.snap b/cargo-dist/tests/snapshots/axolotlsay_abyss_only.snap index 12e6ffc49..1681ffccd 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_abyss_only.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_abyss_only.snap @@ -3821,7 +3821,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -3834,7 +3834,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -3843,11 +3843,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -3856,11 +3856,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -3924,7 +3924,7 @@ on: jobs: # Run 'dist plan' (or host) to determine what tasks we need to do plan: - runs-on: "ubuntu-24.04" + runs-on: "ubuntu-22.04" outputs: val: ${{ steps.plan.outputs.manifest }} tag: ${{ !github.event.pull_request && github.ref_name || '' }} @@ -3941,7 +3941,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: @@ -4046,7 +4046,7 @@ jobs: needs: - plan - build-local-artifacts - runs-on: "ubuntu-24.04" + runs-on: "ubuntu-22.04" env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json @@ -4106,7 +4106,7 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} AXO_RELEASES_TOKEN: ${{ secrets.AXO_RELEASES_TOKEN }} - runs-on: "ubuntu-24.04" + runs-on: "ubuntu-22.04" outputs: val: ${{ steps.host.outputs.manifest }} steps: @@ -4150,7 +4150,7 @@ jobs: # still allowing individual publish jobs to skip themselves (for prereleases). # "host" however must run to completion, no skipping allowed! if: ${{ always() && needs.host.result == 'success' }} - runs-on: "ubuntu-24.04" + runs-on: "ubuntu-22.04" env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} AXO_RELEASES_TOKEN: ${{ secrets.AXO_RELEASES_TOKEN }} diff --git a/cargo-dist/tests/snapshots/axolotlsay_alias.snap b/cargo-dist/tests/snapshots/axolotlsay_alias.snap index f2f5b7d02..0cec0a527 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_alias.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_alias.snap @@ -3869,7 +3869,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -3882,7 +3882,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -3891,11 +3891,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -3904,11 +3904,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -3991,7 +3991,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_alias_ignores_missing_bins.snap b/cargo-dist/tests/snapshots/axolotlsay_alias_ignores_missing_bins.snap index 044dbd6b1..b41b74454 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_alias_ignores_missing_bins.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_alias_ignores_missing_bins.snap @@ -3871,7 +3871,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -3884,7 +3884,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -3893,11 +3893,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -3906,11 +3906,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -3993,7 +3993,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_basic.snap b/cargo-dist/tests/snapshots/axolotlsay_basic.snap index 42cc26dc2..d46ac01d3 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_basic.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_basic.snap @@ -4112,7 +4112,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -4129,11 +4129,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=i686-unknown-linux-gnu", "targets": [ @@ -4155,7 +4155,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -4172,11 +4172,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-gnu", "targets": [ @@ -4193,11 +4193,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -4214,11 +4214,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -4309,7 +4309,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_basic_lies.snap b/cargo-dist/tests/snapshots/axolotlsay_basic_lies.snap index 90c093d6d..4ec0ee3ba 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_basic_lies.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_basic_lies.snap @@ -3939,7 +3939,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -3952,7 +3952,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -3961,11 +3961,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -3974,11 +3974,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -4061,7 +4061,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_build_setup_steps.snap b/cargo-dist/tests/snapshots/axolotlsay_build_setup_steps.snap index 893677672..30ddbcb5f 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_build_setup_steps.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_build_setup_steps.snap @@ -3836,7 +3836,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -3849,7 +3849,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -3858,11 +3858,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -3871,11 +3871,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -3958,7 +3958,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_checksum_blake2b.snap b/cargo-dist/tests/snapshots/axolotlsay_checksum_blake2b.snap index 303ac6e87..a0d21bc54 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_checksum_blake2b.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_checksum_blake2b.snap @@ -1601,7 +1601,7 @@ download_binary_and_run_installer "$@" || exit 1 "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -1614,7 +1614,7 @@ download_binary_and_run_installer "$@" || exit 1 "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -1623,11 +1623,11 @@ download_binary_and_run_installer "$@" || exit 1 "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -1636,11 +1636,11 @@ download_binary_and_run_installer "$@" || exit 1 "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -1723,7 +1723,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_checksum_blake2s.snap b/cargo-dist/tests/snapshots/axolotlsay_checksum_blake2s.snap index 3b276975e..698cbdb07 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_checksum_blake2s.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_checksum_blake2s.snap @@ -1601,7 +1601,7 @@ download_binary_and_run_installer "$@" || exit 1 "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -1614,7 +1614,7 @@ download_binary_and_run_installer "$@" || exit 1 "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -1623,11 +1623,11 @@ download_binary_and_run_installer "$@" || exit 1 "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -1636,11 +1636,11 @@ download_binary_and_run_installer "$@" || exit 1 "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -1723,7 +1723,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_checksum_sha3_256.snap b/cargo-dist/tests/snapshots/axolotlsay_checksum_sha3_256.snap index 4321ce99c..1a249e0da 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_checksum_sha3_256.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_checksum_sha3_256.snap @@ -1601,7 +1601,7 @@ download_binary_and_run_installer "$@" || exit 1 "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -1614,7 +1614,7 @@ download_binary_and_run_installer "$@" || exit 1 "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -1623,11 +1623,11 @@ download_binary_and_run_installer "$@" || exit 1 "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -1636,11 +1636,11 @@ download_binary_and_run_installer "$@" || exit 1 "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -1723,7 +1723,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_checksum_sha3_512.snap b/cargo-dist/tests/snapshots/axolotlsay_checksum_sha3_512.snap index e8561dde9..4226af0d1 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_checksum_sha3_512.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_checksum_sha3_512.snap @@ -1601,7 +1601,7 @@ download_binary_and_run_installer "$@" || exit 1 "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -1614,7 +1614,7 @@ download_binary_and_run_installer "$@" || exit 1 "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -1623,11 +1623,11 @@ download_binary_and_run_installer "$@" || exit 1 "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -1636,11 +1636,11 @@ download_binary_and_run_installer "$@" || exit 1 "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -1723,7 +1723,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_cross1.snap b/cargo-dist/tests/snapshots/axolotlsay_cross1.snap index b2bf94633..3aa946a0b 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_cross1.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_cross1.snap @@ -2337,7 +2337,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -2355,7 +2355,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g }, "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-pc-windows-msvc", "targets": [ @@ -2365,11 +2365,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-unknown-linux-gnu", "targets": [ @@ -2383,7 +2383,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -2401,7 +2401,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g }, "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -2411,11 +2411,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -2498,7 +2498,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_cross2.snap b/cargo-dist/tests/snapshots/axolotlsay_cross2.snap index 1d90aae15..683b0c014 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_cross2.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_cross2.snap @@ -2000,7 +2000,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g }, "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-pc-windows-msvc", "targets": [ @@ -2019,7 +2019,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g }, "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-unknown-linux-gnu", "targets": [ @@ -2102,7 +2102,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_custom_formula.snap b/cargo-dist/tests/snapshots/axolotlsay_custom_formula.snap index 1463cba76..237bf7ed9 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_custom_formula.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_custom_formula.snap @@ -335,7 +335,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -348,7 +348,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -357,11 +357,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -370,11 +370,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -441,7 +441,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_custom_github_runners.snap b/cargo-dist/tests/snapshots/axolotlsay_custom_github_runners.snap index d35e0fbbd..71b587381 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_custom_github_runners.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_custom_github_runners.snap @@ -257,7 +257,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "aarch64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-unknown-linux-gnu", "targets": [ @@ -270,7 +270,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "aarch64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-unknown-linux-musl", "targets": [ @@ -284,7 +284,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -297,7 +297,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-musl", "targets": [ @@ -381,7 +381,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_disable_source_tarball.snap b/cargo-dist/tests/snapshots/axolotlsay_disable_source_tarball.snap index ad570d083..d8e972c7c 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_disable_source_tarball.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_disable_source_tarball.snap @@ -3824,7 +3824,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) axolotlsay-n "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -3837,7 +3837,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) axolotlsay-n "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -3846,11 +3846,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) axolotlsay-n "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -3859,11 +3859,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) axolotlsay-n "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -3946,7 +3946,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_dispatch.snap b/cargo-dist/tests/snapshots/axolotlsay_dispatch.snap index 6c0116fc0..60713e62f 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_dispatch.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_dispatch.snap @@ -257,7 +257,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -270,7 +270,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -279,11 +279,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -292,11 +292,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -383,7 +383,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_dispatch_abyss.snap b/cargo-dist/tests/snapshots/axolotlsay_dispatch_abyss.snap index 61e02745f..187b2d1d5 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_dispatch_abyss.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_dispatch_abyss.snap @@ -265,7 +265,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -278,7 +278,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -287,11 +287,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -300,11 +300,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -393,7 +393,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_dispatch_abyss_only.snap b/cargo-dist/tests/snapshots/axolotlsay_dispatch_abyss_only.snap index 065419300..2257e745b 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_dispatch_abyss_only.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_dispatch_abyss_only.snap @@ -258,7 +258,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -271,7 +271,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -280,11 +280,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -293,11 +293,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -382,7 +382,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_dist_url_override.snap b/cargo-dist/tests/snapshots/axolotlsay_dist_url_override.snap index f0c8510dc..d6115c590 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_dist_url_override.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_dist_url_override.snap @@ -2168,7 +2168,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://dl.bearcove.cloud/dump/dist-cross/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://dl.bearcove.cloud/dump/dist-cross/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -2181,7 +2181,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://dl.bearcove.cloud/dump/dist-cross/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://dl.bearcove.cloud/dump/dist-cross/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -2190,11 +2190,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://dl.bearcove.cloud/dump/dist-cross/cargo-dist-installer.ps1 | iex" + "run": "irm https://dl.bearcove.cloud/dump/dist-cross/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -2203,11 +2203,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://dl.bearcove.cloud/dump/dist-cross/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://dl.bearcove.cloud/dump/dist-cross/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -2290,7 +2290,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://dl.bearcove.cloud/dump/dist-cross/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://dl.bearcove.cloud/dump/dist-cross/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_edit_existing.snap b/cargo-dist/tests/snapshots/axolotlsay_edit_existing.snap index 23166edc5..6fb2859c9 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_edit_existing.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_edit_existing.snap @@ -3758,7 +3758,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -3771,7 +3771,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -3780,11 +3780,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -3793,11 +3793,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -3880,7 +3880,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_generic_workspace_basic.snap b/cargo-dist/tests/snapshots/axolotlsay_generic_workspace_basic.snap index dfd3ac5b9..b20ff25d3 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_generic_workspace_basic.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_generic_workspace_basic.snap @@ -4424,7 +4424,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -4437,7 +4437,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -4446,11 +4446,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -4459,11 +4459,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -4546,7 +4546,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_homebrew_linux_only.snap b/cargo-dist/tests/snapshots/axolotlsay_homebrew_linux_only.snap index bfbd83d40..cc1e8ffaa 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_homebrew_linux_only.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_homebrew_linux_only.snap @@ -176,11 +176,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "artifacts_matrix": { "include": [ { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -263,7 +263,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_homebrew_macos_x86_64_only.snap b/cargo-dist/tests/snapshots/axolotlsay_homebrew_macos_x86_64_only.snap index aabf3d674..c364795fe 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_homebrew_macos_x86_64_only.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_homebrew_macos_x86_64_only.snap @@ -183,7 +183,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -266,7 +266,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_homebrew_packages.snap b/cargo-dist/tests/snapshots/axolotlsay_homebrew_packages.snap index 49079939e..afa39d257 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_homebrew_packages.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_homebrew_packages.snap @@ -3836,7 +3836,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -3850,7 +3850,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -3860,11 +3860,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -3873,11 +3873,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -3960,7 +3960,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_musl.snap b/cargo-dist/tests/snapshots/axolotlsay_musl.snap index 91934bbe9..63b7c13d3 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_musl.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_musl.snap @@ -3118,7 +3118,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -3131,7 +3131,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -3140,11 +3140,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -3153,11 +3153,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-musl", "targets": [ @@ -3241,7 +3241,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_musl_no_gnu.snap b/cargo-dist/tests/snapshots/axolotlsay_musl_no_gnu.snap index dbc65e76d..d1bf03d7d 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_musl_no_gnu.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_musl_no_gnu.snap @@ -3053,7 +3053,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -3066,7 +3066,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -3075,11 +3075,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-musl", "targets": [ @@ -3163,7 +3163,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_no_homebrew_publish.snap b/cargo-dist/tests/snapshots/axolotlsay_no_homebrew_publish.snap index 3c3b3383e..701526b19 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_no_homebrew_publish.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_no_homebrew_publish.snap @@ -3758,7 +3758,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -3771,7 +3771,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -3780,11 +3780,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -3793,11 +3793,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -3880,7 +3880,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_no_locals.snap b/cargo-dist/tests/snapshots/axolotlsay_no_locals.snap index 0a7f1b089..45f8e07df 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_no_locals.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_no_locals.snap @@ -257,7 +257,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -270,7 +270,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -279,11 +279,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -292,11 +292,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -379,7 +379,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_no_locals_but_custom.snap b/cargo-dist/tests/snapshots/axolotlsay_no_locals_but_custom.snap index 6866a7fb6..19dfc6afc 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_no_locals_but_custom.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_no_locals_but_custom.snap @@ -257,7 +257,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -270,7 +270,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -279,11 +279,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -292,11 +292,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -363,7 +363,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_several_aliases.snap b/cargo-dist/tests/snapshots/axolotlsay_several_aliases.snap index eb296bd22..c1a041086 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_several_aliases.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_several_aliases.snap @@ -3875,7 +3875,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -3888,7 +3888,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -3897,11 +3897,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -3910,11 +3910,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -3997,7 +3997,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign.snap b/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign.snap index e8aecba07..324be4252 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign.snap @@ -2246,7 +2246,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -2259,7 +2259,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -2268,11 +2268,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -2281,11 +2281,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -2368,7 +2368,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign_prod.snap b/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign_prod.snap index e8aecba07..324be4252 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign_prod.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign_prod.snap @@ -2246,7 +2246,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -2259,7 +2259,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -2268,11 +2268,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -2281,11 +2281,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -2368,7 +2368,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_tag_namespace.snap b/cargo-dist/tests/snapshots/axolotlsay_tag_namespace.snap index 1b3a720ee..69e465459 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_tag_namespace.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_tag_namespace.snap @@ -257,7 +257,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -270,7 +270,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -279,11 +279,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -292,11 +292,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -379,7 +379,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_updaters.snap b/cargo-dist/tests/snapshots/axolotlsay_updaters.snap index 6864b311c..f61d11f3a 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_updaters.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_updaters.snap @@ -3880,7 +3880,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -3893,7 +3893,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -3902,11 +3902,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -3915,11 +3915,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -4002,7 +4002,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_user_global_build_job.snap b/cargo-dist/tests/snapshots/axolotlsay_user_global_build_job.snap index 35116ffa0..b788d30cc 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_user_global_build_job.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_user_global_build_job.snap @@ -3758,7 +3758,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -3771,7 +3771,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -3780,11 +3780,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -3793,11 +3793,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -3880,7 +3880,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_user_host_job.snap b/cargo-dist/tests/snapshots/axolotlsay_user_host_job.snap index 99f9e3bf3..41a2257b2 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_user_host_job.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_user_host_job.snap @@ -3758,7 +3758,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -3771,7 +3771,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -3780,11 +3780,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -3793,11 +3793,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -3880,7 +3880,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_user_local_build_job.snap b/cargo-dist/tests/snapshots/axolotlsay_user_local_build_job.snap index 07c0d138e..0e971fcf4 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_user_local_build_job.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_user_local_build_job.snap @@ -3758,7 +3758,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -3771,7 +3771,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -3780,11 +3780,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -3793,11 +3793,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -3880,7 +3880,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_user_plan_job.snap b/cargo-dist/tests/snapshots/axolotlsay_user_plan_job.snap index 3d081fa06..17ef8104d 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_user_plan_job.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_user_plan_job.snap @@ -3758,7 +3758,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -3771,7 +3771,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -3780,11 +3780,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -3793,11 +3793,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -3880,7 +3880,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/axolotlsay_user_publish_job.snap b/cargo-dist/tests/snapshots/axolotlsay_user_publish_job.snap index 4aa3f8c18..ad33c7b9a 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_user_publish_job.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_user_publish_job.snap @@ -3758,7 +3758,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -3771,7 +3771,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -3780,11 +3780,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -3793,11 +3793,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -3880,7 +3880,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: diff --git a/cargo-dist/tests/snapshots/install_path_cargo_home.snap b/cargo-dist/tests/snapshots/install_path_cargo_home.snap index ac0692f23..d1b5784bb 100644 --- a/cargo-dist/tests/snapshots/install_path_cargo_home.snap +++ b/cargo-dist/tests/snapshots/install_path_cargo_home.snap @@ -2246,7 +2246,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -2259,7 +2259,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -2268,11 +2268,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -2281,11 +2281,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ diff --git a/cargo-dist/tests/snapshots/install_path_env_no_subdir.snap b/cargo-dist/tests/snapshots/install_path_env_no_subdir.snap index 044330b28..e00e49f49 100644 --- a/cargo-dist/tests/snapshots/install_path_env_no_subdir.snap +++ b/cargo-dist/tests/snapshots/install_path_env_no_subdir.snap @@ -2222,7 +2222,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -2235,7 +2235,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -2244,11 +2244,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -2257,11 +2257,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ diff --git a/cargo-dist/tests/snapshots/install_path_env_subdir.snap b/cargo-dist/tests/snapshots/install_path_env_subdir.snap index 03f0aa8ec..8c022aaea 100644 --- a/cargo-dist/tests/snapshots/install_path_env_subdir.snap +++ b/cargo-dist/tests/snapshots/install_path_env_subdir.snap @@ -2222,7 +2222,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -2235,7 +2235,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -2244,11 +2244,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -2257,11 +2257,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ diff --git a/cargo-dist/tests/snapshots/install_path_env_subdir_space.snap b/cargo-dist/tests/snapshots/install_path_env_subdir_space.snap index cb59d4224..54f0a6886 100644 --- a/cargo-dist/tests/snapshots/install_path_env_subdir_space.snap +++ b/cargo-dist/tests/snapshots/install_path_env_subdir_space.snap @@ -2222,7 +2222,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -2235,7 +2235,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -2244,11 +2244,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -2257,11 +2257,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ diff --git a/cargo-dist/tests/snapshots/install_path_env_subdir_space_deeper.snap b/cargo-dist/tests/snapshots/install_path_env_subdir_space_deeper.snap index 0b82b56b3..105309bf1 100644 --- a/cargo-dist/tests/snapshots/install_path_env_subdir_space_deeper.snap +++ b/cargo-dist/tests/snapshots/install_path_env_subdir_space_deeper.snap @@ -2222,7 +2222,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -2235,7 +2235,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -2244,11 +2244,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -2257,11 +2257,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ diff --git a/cargo-dist/tests/snapshots/install_path_fallback_no_env_var_set.snap b/cargo-dist/tests/snapshots/install_path_fallback_no_env_var_set.snap index 08a584f93..95445f417 100644 --- a/cargo-dist/tests/snapshots/install_path_fallback_no_env_var_set.snap +++ b/cargo-dist/tests/snapshots/install_path_fallback_no_env_var_set.snap @@ -2245,7 +2245,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -2258,7 +2258,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -2267,11 +2267,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -2280,11 +2280,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ diff --git a/cargo-dist/tests/snapshots/install_path_fallback_to_cargo_home.snap b/cargo-dist/tests/snapshots/install_path_fallback_to_cargo_home.snap index d19a72e89..61b91ebad 100644 --- a/cargo-dist/tests/snapshots/install_path_fallback_to_cargo_home.snap +++ b/cargo-dist/tests/snapshots/install_path_fallback_to_cargo_home.snap @@ -1640,7 +1640,7 @@ try { "aarch64-apple-darwin" ], "runner": "macos-12", - "install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh", + "install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh", "dist_args": "--artifacts=local --target=aarch64-apple-darwin" }, { @@ -1648,23 +1648,23 @@ try { "x86_64-apple-darwin" ], "runner": "macos-12", - "install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh", + "install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh", "dist_args": "--artifacts=local --target=x86_64-apple-darwin" }, { "targets": [ "x86_64-pc-windows-msvc" ], - "runner": "windows-2019", - "install_dist": "powershell -c \"irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex\"", + "runner": "windows-2022", + "install_dist": "powershell -c \"irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex\"", "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc" }, { "targets": [ "x86_64-unknown-linux-gnu" ], - "runner": "ubuntu-24.04", - "install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh", + "runner": "ubuntu-22.04", + "install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh", "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu" } ] diff --git a/cargo-dist/tests/snapshots/install_path_home_subdir_deeper.snap b/cargo-dist/tests/snapshots/install_path_home_subdir_deeper.snap index f0bea5125..71937ed88 100644 --- a/cargo-dist/tests/snapshots/install_path_home_subdir_deeper.snap +++ b/cargo-dist/tests/snapshots/install_path_home_subdir_deeper.snap @@ -2222,7 +2222,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -2235,7 +2235,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -2244,11 +2244,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -2257,11 +2257,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ diff --git a/cargo-dist/tests/snapshots/install_path_home_subdir_min.snap b/cargo-dist/tests/snapshots/install_path_home_subdir_min.snap index dd8f1e026..9b3ce75e5 100644 --- a/cargo-dist/tests/snapshots/install_path_home_subdir_min.snap +++ b/cargo-dist/tests/snapshots/install_path_home_subdir_min.snap @@ -2222,7 +2222,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -2235,7 +2235,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -2244,11 +2244,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -2257,11 +2257,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ diff --git a/cargo-dist/tests/snapshots/install_path_home_subdir_space.snap b/cargo-dist/tests/snapshots/install_path_home_subdir_space.snap index f1492fce7..79fc3d716 100644 --- a/cargo-dist/tests/snapshots/install_path_home_subdir_space.snap +++ b/cargo-dist/tests/snapshots/install_path_home_subdir_space.snap @@ -2222,7 +2222,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -2235,7 +2235,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -2244,11 +2244,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -2257,11 +2257,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ diff --git a/cargo-dist/tests/snapshots/install_path_home_subdir_space_deeper.snap b/cargo-dist/tests/snapshots/install_path_home_subdir_space_deeper.snap index e39ff1f40..21c95e640 100644 --- a/cargo-dist/tests/snapshots/install_path_home_subdir_space_deeper.snap +++ b/cargo-dist/tests/snapshots/install_path_home_subdir_space_deeper.snap @@ -2222,7 +2222,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -2235,7 +2235,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -2244,11 +2244,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -2257,11 +2257,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ diff --git a/cargo-dist/tests/snapshots/install_path_no_fallback_taken.snap b/cargo-dist/tests/snapshots/install_path_no_fallback_taken.snap index cc8d6ba9a..c52d018c1 100644 --- a/cargo-dist/tests/snapshots/install_path_no_fallback_taken.snap +++ b/cargo-dist/tests/snapshots/install_path_no_fallback_taken.snap @@ -2245,7 +2245,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -2258,7 +2258,7 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -2267,11 +2267,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -2280,11 +2280,11 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-22.04", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/vSOME_VERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ diff --git a/cargo-dist/tests/snapshots/manifest.snap b/cargo-dist/tests/snapshots/manifest.snap index d23ee8263..eefdb491c 100644 --- a/cargo-dist/tests/snapshots/manifest.snap +++ b/cargo-dist/tests/snapshots/manifest.snap @@ -500,7 +500,7 @@ stdout: "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/v1.0.0-FAKEVERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/v1.0.0-FAKEVERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "targets": [ @@ -509,7 +509,7 @@ stdout: "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-latest", "host": "x86_64-unknown-linux-gnu", "container": { "image": "quay.io/pypa/manylinux_2_28_x86_64", @@ -518,7 +518,7 @@ stdout: }, "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/v1.0.0-FAKEVERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/v1.0.0-FAKEVERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-unknown-linux-gnu", "targets": [ @@ -528,7 +528,7 @@ stdout: "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-latest", "host": "x86_64-unknown-linux-gnu", "container": { "image": "quay.io/pypa/manylinux_2_28_x86_64", @@ -537,7 +537,7 @@ stdout: }, "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/v1.0.0-FAKEVERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/v1.0.0-FAKEVERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=aarch64-unknown-linux-musl", "targets": [ @@ -551,7 +551,7 @@ stdout: "host": "x86_64-apple-darwin", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/v1.0.0-FAKEVERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/v1.0.0-FAKEVERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "targets": [ @@ -560,11 +560,11 @@ stdout: "cache_provider": "github" }, { - "runner": "windows-2019", + "runner": "windows-2022", "host": "x86_64-pc-windows-msvc", "install_dist": { "shell": "pwsh", - "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/v1.0.0-FAKEVERSION/cargo-dist-installer.ps1 | iex" + "run": "irm https://github.com/oxidecomputer/cargo-dist/releases/download/v1.0.0-FAKEVERSION/dist-installer.ps1 | iex" }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "targets": [ @@ -573,11 +573,11 @@ stdout: "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-latest", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/v1.0.0-FAKEVERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/v1.0.0-FAKEVERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "targets": [ @@ -586,11 +586,11 @@ stdout: "cache_provider": "github" }, { - "runner": "ubuntu-24.04", + "runner": "ubuntu-latest", "host": "x86_64-unknown-linux-gnu", "install_dist": { "shell": "sh", - "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/v1.0.0-FAKEVERSION/cargo-dist-installer.sh | sh" + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/v1.0.0-FAKEVERSION/dist-installer.sh | sh" }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-musl", "targets": [