diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 81e8dd579..54626b903 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -67,7 +67,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/v0.24.0-prerelease.2/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.24.1/cargo-dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: @@ -122,7 +122,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/Cargo.lock b/Cargo.lock index f9f12c2c4..8f8a817a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -424,6 +424,7 @@ dependencies = [ "mach_object", "miette 7.2.0", "newline-converter", + "schemars", "semver", "serde", "serde_json", diff --git a/cargo-dist-schema/src/lib.rs b/cargo-dist-schema/src/lib.rs index 6cc355099..fbcc068df 100644 --- a/cargo-dist-schema/src/lib.rs +++ b/cargo-dist-schema/src/lib.rs @@ -302,8 +302,7 @@ pub struct GithubMatrixEntry { #[serde(skip_serializing_if = "Option::is_none")] pub runner: Option, /// Expression to execute to install dist - #[serde(skip_serializing_if = "Option::is_none")] - pub install_dist: Option, + pub install_dist: GhaRunStep, /// Arguments to pass to dist #[serde(skip_serializing_if = "Option::is_none")] pub dist_args: Option, @@ -315,6 +314,41 @@ pub struct GithubMatrixEntry { pub cache_provider: Option, } +/// A GitHub Actions "run" step, either bash or powershell +#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)] +// this mirrors GHA's structure, see +// * +// * +#[serde(tag = "shell", content = "run")] +pub enum GhaRunStep { + /// see [`DashScript`] + #[serde(rename = "sh")] + Dash(DashScript), + /// see [`PowershellScript`] + #[serde(rename = "pwsh")] + Powershell(PowershellScript), +} + +impl From for GhaRunStep { + fn from(bash: DashScript) -> Self { + Self::Dash(bash) + } +} + +impl From for GhaRunStep { + fn from(powershell: PowershellScript) -> Self { + Self::Powershell(powershell) + } +} + +declare_strongly_typed_string! { + /// A bit of shell script (that can run with `/bin/sh`), ran on CI runners. Can be multi-line. + pub struct DashScript => &DashScriptRef; + + /// A bit of powershell script, ran on CI runners. Can be multi-line. + pub struct PowershellScript => &PowershellScriptRef; +} + /// Type of job to run on pull request #[derive( Debug, Copy, Clone, Serialize, Deserialize, JsonSchema, Default, PartialEq, Eq, PartialOrd, Ord, diff --git a/cargo-dist-schema/src/snapshots/cargo_dist_schema__emit.snap b/cargo-dist-schema/src/snapshots/cargo_dist_schema__emit.snap index 1fa7ccc86..506413e93 100644 --- a/cargo-dist-schema/src/snapshots/cargo_dist_schema__emit.snap +++ b/cargo-dist-schema/src/snapshots/cargo_dist_schema__emit.snap @@ -693,6 +693,49 @@ expression: json_schema } } }, + "GhaRunStep": { + "description": "A GitHub Actions \"run\" step, either bash or powershell", + "oneOf": [ + { + "description": "see [`DashScript`]", + "type": "object", + "required": [ + "run", + "shell" + ], + "properties": { + "run": { + "type": "string" + }, + "shell": { + "type": "string", + "enum": [ + "sh" + ] + } + } + }, + { + "description": "see [`PowershellScript`]", + "type": "object", + "required": [ + "run", + "shell" + ], + "properties": { + "run": { + "type": "string" + }, + "shell": { + "type": "string", + "enum": [ + "pwsh" + ] + } + } + } + ] + }, "GithubCiInfo": { "description": "Github CI backend", "type": "object", @@ -772,6 +815,9 @@ expression: json_schema "GithubMatrixEntry": { "description": "Entry for a github matrix", "type": "object", + "required": [ + "install_dist" + ], "properties": { "cache_provider": { "description": "what cache provider to use", @@ -789,9 +835,10 @@ expression: json_schema }, "install_dist": { "description": "Expression to execute to install dist", - "type": [ - "string", - "null" + "allOf": [ + { + "$ref": "#/definitions/GhaRunStep" + } ] }, "packages_install": { diff --git a/cargo-dist/Cargo.toml b/cargo-dist/Cargo.toml index 961b6a433..6c5bda6b3 100644 --- a/cargo-dist/Cargo.toml +++ b/cargo-dist/Cargo.toml @@ -72,6 +72,7 @@ lazy_static.workspace = true current_platform.workspace = true color-backtrace.workspace = true backtrace.workspace = true +schemars.workspace = true [dev-dependencies] insta.workspace = true diff --git a/cargo-dist/src/backend/ci/github.rs b/cargo-dist/src/backend/ci/github.rs index 0d27ebdab..3590145c7 100644 --- a/cargo-dist/src/backend/ci/github.rs +++ b/cargo-dist/src/backend/ci/github.rs @@ -8,7 +8,8 @@ use axoasset::{LocalAsset, SourceFile}; use axoprocess::Cmd; use camino::{Utf8Path, Utf8PathBuf}; use cargo_dist_schema::{ - GithubMatrix, GithubMatrixEntry, GithubRunner, GithubRunnerRef, TargetTriple, TargetTripleRef, + GhaRunStep, GithubMatrix, GithubMatrixEntry, GithubRunner, GithubRunnerRef, TargetTriple, + TargetTripleRef, }; use serde::{Deserialize, Serialize}; use tracing::warn; @@ -24,6 +25,8 @@ use crate::{ DistError, DistGraph, SortedMap, SortedSet, }; +use super::{DistInstallSettings, DistInstallStrategy}; + #[cfg(not(windows))] const GITHUB_CI_DIR: &str = ".github/workflows/"; #[cfg(windows)] @@ -31,6 +34,8 @@ const GITHUB_CI_DIR: &str = r".github\workflows\"; const GITHUB_CI_FILE: &str = "release.yml"; /// Info about running dist in Github CI +/// +/// THESE FIELDS ARE LOAD-BEARING because they're used in the templates. #[derive(Debug, Serialize)] pub struct GithubCiInfo { /// Cached path to github CI workflows dir @@ -38,10 +43,12 @@ pub struct GithubCiInfo { pub github_ci_workflow_dir: Utf8PathBuf, /// Version of rust toolchain to install (deprecated) pub rust_version: Option, - /// expression to use for installing dist via shell script - pub install_dist_sh: String, - /// expression to use for installing dist via powershell script - pub install_dist_ps1: String, + + /// How to install dist when "coordinating" (plan, global build, etc.) + pub dist_install_for_coordinator: GhaRunStep, + /// Our install strategy for dist itself + pub dist_install_strategy: DistInstallStrategy, + /// Whether to fail-fast pub fail_fast: bool, /// Whether to cache builds @@ -216,8 +223,12 @@ impl GithubCiInfo { } // Get the platform-specific installation methods - let install_dist_sh = super::install_dist_sh_for_version(dist_version); - let install_dist_ps1 = super::install_dist_ps1_for_version(dist_version); + let dist_install_strategy = (DistInstallSettings { + version: dist_version, + url_override: dist.config.dist_url_override.as_deref(), + }) + .install_strategy(); + let hosting_providers = dist .hosting .as_ref() @@ -245,7 +256,7 @@ impl GithubCiInfo { cache_provider: cache_provider_for_runner(global_runner), runner: Some(global_runner.to_owned()), dist_args: Some("--artifacts=global".into()), - install_dist: Some(install_dist_sh.clone()), + install_dist: dist_install_strategy.sh().into(), packages_install: None, }; @@ -300,8 +311,7 @@ impl GithubCiInfo { }; for (runner, targets) in local_runs { use std::fmt::Write; - let install_dist = - install_dist_for_targets(&targets, &install_dist_sh, &install_dist_ps1); + let install_dist = install_dist_for_targets(&targets, &dist_install_strategy); let mut dist_args = String::from("--artifacts=local"); for target in &targets { write!(dist_args, " --target={target}").unwrap(); @@ -311,7 +321,7 @@ impl GithubCiInfo { cache_provider: cache_provider_for_runner(&runner), runner: Some(runner), dist_args: Some(dist_args), - install_dist: Some(install_dist.to_owned()), + install_dist: install_dist.to_owned(), packages_install: package_install_for_targets(&targets, &dependencies), }); } @@ -334,8 +344,8 @@ impl GithubCiInfo { github_ci_workflow_dir, tag_namespace, rust_version, - install_dist_sh, - install_dist_ps1, + dist_install_for_coordinator: dist_install_strategy.sh().into(), + dist_install_strategy, fail_fast, cache_builds, build_local_artifacts, @@ -621,18 +631,20 @@ fn github_runner_for_target( /// Select the dist installer approach for a given Github Runner fn install_dist_for_targets<'a>( targets: &'a [&'a TargetTripleRef], - install_sh: &'a str, - install_ps1: &'a str, -) -> &'a str { + install_strategy: &'a DistInstallStrategy, +) -> GhaRunStep { + // FIXME: when doing cross-compilation, `host != runner`, and we should + // pick something that runs on the host. We need knowledge about "which + // platform is this GitHub runner" ahead of time to do that, though. + for target in targets { if target.is_linux() || target.is_apple() { - return install_sh; + return install_strategy.sh().into(); } else if target.is_windows() { - return install_ps1; + return install_strategy.powershell().into(); } } - - unreachable!("internal error: unknown target triple!?") + panic!("unsupported target triple(s) {targets:?}"); } fn brewfile_from(packages: &[String]) -> String { diff --git a/cargo-dist/src/backend/ci/mod.rs b/cargo-dist/src/backend/ci/mod.rs index ecc93c22d..1e55e1851 100644 --- a/cargo-dist/src/backend/ci/mod.rs +++ b/cargo-dist/src/backend/ci/mod.rs @@ -1,6 +1,10 @@ //! Support for generating CI scripts for running dist +use cargo_dist_schema::{DashScript, PowershellScript}; use semver::Version; +use serde::Serialize; + +use crate::config::v0::CargoDistUrlOverrideRef; use self::github::GithubCiInfo; @@ -17,52 +21,87 @@ pub struct CiInfo { pub github: Option, } -/// Get the command to invoke to install dist via sh script -fn install_dist_sh_for_version(version: &Version) -> String { - if let Some(git) = install_dist_git(version) { - return git; - } - let format = cargo_dist_schema::format_of_version(version); - let installer_name = if format.unsupported() { - // FIXME: we should probably do this check way higher up and produce a proper err... - panic!("requested dist v{version}, which is not supported by the this copy of dist ({SELF_DIST_VERSION})"); - } else if format.artifact_names_contain_versions() { - format!("cargo-dist-v{version}-installer.sh") - } else { - "cargo-dist-installer.sh".to_owned() - }; +/// Gives us the full information re: the version of dist we're supposed +/// to install/run in CI +struct DistInstallSettings<'a> { + version: &'a Version, + url_override: Option<&'a CargoDistUrlOverrideRef>, +} - // FIXME: it would be nice if these values were somehow using all the machinery - // to compute these values for packages we build *BUT* it's messy and not that important - let installer_url = format!("{BASE_DIST_FETCH_URL}/v{version}/{installer_name}"); - format!("curl --proto '=https' --tlsv1.2 -LsSf {installer_url} | sh") +/// The strategy used to install dist in CI +#[derive(Debug, Clone, Serialize)] +pub enum DistInstallStrategy { + /// Download an installer and run it + Installer { + /// the prefix of the installer url, e.g. + installer_url: String, + /// the installer name, without `.sh` or `.ps1` + installer_name: String, + }, + /// Run `cargo install --git` (slow!) + GitBranch { + /// the branch to install from — from + branch: String, + }, } -/// Get the command to invoke to install dist via ps1 script -fn install_dist_ps1_for_version(version: &Version) -> String { - if let Some(git) = install_dist_git(version) { - return git; - } - let format = cargo_dist_schema::format_of_version(version); - let installer_name = if format.unsupported() { - // FIXME: we should probably do this check way higher up and produce a proper err... - panic!("requested dist v{version}, which is not supported by the this copy of dist ({SELF_DIST_VERSION})"); - } else if format.artifact_names_contain_versions() { - format!("cargo-dist-v{version}-installer.ps1") - } else { - "cargo-dist-installer.ps1".to_owned() - }; +impl DistInstallSettings<'_> { + fn install_strategy(&self) -> DistInstallStrategy { + if let Some(branch) = self.version.pre.strip_prefix("github-") { + return DistInstallStrategy::GitBranch { + branch: branch.to_owned(), + }; + } + + 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(), + }; + } - // FIXME: it would be nice if these values were somehow using all the machinery - // to compute these values for packages we build *BUT* it's messy and not that important - let installer_url = format!("{BASE_DIST_FETCH_URL}/v{version}/{installer_name}"); - format!(r#"powershell -c "irm {installer_url} | iex""#) + let version = self.version; + let format = cargo_dist_schema::format_of_version(version); + let installer_name = if format.unsupported() { + // FIXME: we should probably do this check way higher up and produce a proper err... + panic!("requested dist v{version}, which is not supported by the this copy of dist ({SELF_DIST_VERSION})"); + } else if format.artifact_names_contain_versions() { + format!("cargo-dist-v{version}-installer") + } else { + "cargo-dist-installer".to_owned() + }; + + DistInstallStrategy::Installer { + // FIXME: it would be nice if these values were somehow using all the machinery + // to compute these values for packages we build *BUT* it's messy and not that important + installer_url: format!("{BASE_DIST_FETCH_URL}/v{version}"), + installer_name, + } + } } -/// Cute little hack for developing dist itself: if we see a version like "0.0.3-github-config" -/// then install from the main github repo with branch=config! -fn install_dist_git(version: &Version) -> Option { - version.pre.strip_prefix("github-").map(|branch| { - format!("cargo install --git https://github.com/axodotdev/cargo-dist/ --branch={branch} cargo-dist") - }) +impl DistInstallStrategy { + /// Returns a bit of powershell to install the requested version of dist + fn powershell(&self) -> PowershellScript { + PowershellScript::new(match self { + DistInstallStrategy::Installer { installer_url, installer_name } => format!( + "irm {installer_url}/{installer_name}.ps1 | iex" + ), + DistInstallStrategy::GitBranch { branch } => format!( + "cargo install --git https://github.com/axodotdev/cargo-dist/ --branch={branch} cargo-dist" + ), + }) + } + + /// Returns a bit of sh/dash to install the requested version of dist + pub fn sh(&self) -> DashScript { + DashScript::new(match self { + DistInstallStrategy::Installer { installer_url, installer_name } => format!( + "curl --proto '=https' --tlsv1.2 -LsSf {installer_url}/{installer_name}.sh | sh" + ), + DistInstallStrategy::GitBranch { branch } => format!( + "cargo install --git https://github.com/axodotdev/cargo-dist/ --branch={branch} cargo-dist" + ), + }) + } } diff --git a/cargo-dist/src/config/v0.rs b/cargo-dist/src/config/v0.rs index a853c6428..57c9c3ca8 100644 --- a/cargo-dist/src/config/v0.rs +++ b/cargo-dist/src/config/v0.rs @@ -1,7 +1,7 @@ //! v0 config use camino::{Utf8Path, Utf8PathBuf}; -use cargo_dist_schema::GithubRunner; +use cargo_dist_schema::{declare_strongly_typed_string, GithubRunner}; use semver::Version; use serde::{Deserialize, Serialize}; use tracing::log::warn; @@ -17,6 +17,14 @@ pub struct GenericConfig { pub dist: Option, } +declare_strongly_typed_string! { + /// A URL to use to install `cargo-dist` (with the installer script). + /// This overwrites `cargo_dist_version` and expects the URL to have + /// a similar structure to `./target/distrib` after running `dist build` + /// on itself. + pub struct CargoDistUrlOverride => &CargoDistUrlOverrideRef; +} + /// Contents of METADATA_DIST in Cargo.toml files #[derive(Serialize, Deserialize, Debug, Default, Clone)] #[serde(rename_all = "kebab-case")] @@ -32,6 +40,10 @@ pub struct DistMetadata { #[serde(skip_serializing_if = "Option::is_none")] pub cargo_dist_version: Option, + /// See [`CargoDistUrlOverride`] + #[serde(skip_serializing_if = "Option::is_none")] + pub cargo_dist_url_override: Option, + /// (deprecated) The intended version of Rust/Cargo to build with (rustup toolchain syntax) /// /// When generating full tasks graphs (such as CI scripts) we will pick this version. @@ -453,6 +465,7 @@ impl DistMetadata { extra_artifacts, // The rest of these don't include relative paths cargo_dist_version: _, + cargo_dist_url_override: _, rust_toolchain_version: _, dist: _, ci: _, @@ -548,6 +561,7 @@ impl DistMetadata { // This is intentionally written awkwardly to make you update it let DistMetadata { cargo_dist_version, + cargo_dist_url_override, rust_toolchain_version, dist, ci, @@ -614,6 +628,9 @@ impl DistMetadata { if cargo_dist_version.is_some() { warn!("package.metadata.dist.cargo-dist-version is set, but this is only accepted in workspace.metadata (value is being ignored): {}", package_manifest_path); } + if cargo_dist_url_override.is_some() { + warn!("package.metadata.dist.cargo-dist-url-override is set, but this is only accepted in workspace.metadata (value is being ignored): {}", package_manifest_path); + } if rust_toolchain_version.is_some() { warn!("package.metadata.dist.rust-toolchain-version is set, but this is only accepted in workspace.metadata (value is being ignored): {}", package_manifest_path); } diff --git a/cargo-dist/src/config/v0_to_v1.rs b/cargo-dist/src/config/v0_to_v1.rs index ba590957f..c19aceb81 100644 --- a/cargo-dist/src/config/v0_to_v1.rs +++ b/cargo-dist/src/config/v0_to_v1.rs @@ -23,6 +23,7 @@ impl DistMetadata { pub fn to_toml_layer(&self, is_global: bool) -> TomlLayer { let DistMetadata { cargo_dist_version, + cargo_dist_url_override, rust_toolchain_version, dist, ci, @@ -341,6 +342,7 @@ impl DistMetadata { TomlLayer { dist_version: cargo_dist_version, + dist_url_override: cargo_dist_url_override, dist, allow_dirty, targets, diff --git a/cargo-dist/src/config/v1/mod.rs b/cargo-dist/src/config/v1/mod.rs index 7158aaeff..9c5a8b968 100644 --- a/cargo-dist/src/config/v1/mod.rs +++ b/cargo-dist/src/config/v1/mod.rs @@ -114,6 +114,7 @@ pub mod publishers; use axoproject::{PackageIdx, WorkspaceGraph}; use semver::Version; +use v0::CargoDistUrlOverride; use super::*; use layer::*; @@ -161,6 +162,8 @@ pub fn app_config( pub struct WorkspaceConfig { /// The intended version of dist to build with. (normal Cargo SemVer syntax) pub dist_version: Option, + /// See [`CargoDistUrlOverride`] + pub dist_url_override: Option, /// Generate targets whose dist should avoid checking for up-to-dateness. pub allow_dirty: Vec, /// ci config @@ -181,6 +184,8 @@ pub struct WorkspaceConfig { pub struct WorkspaceConfigInheritable { /// The intended version of dist to build with. (normal Cargo SemVer syntax) pub dist_version: Option, + /// See [`CargoDistUrlOverride`] + pub dist_url_override: Option, /// Generate targets whose dist should avoid checking for up-to-dateness. pub allow_dirty: Vec, /// artifact config @@ -204,6 +209,7 @@ impl WorkspaceConfigInheritable { builds: BuildConfigInheritable::defaults_for_workspace(workspaces), installers: InstallerConfigInheritable::defaults_for_workspace(workspaces), dist_version: None, + dist_url_override: None, allow_dirty: vec![], } } @@ -216,6 +222,7 @@ impl WorkspaceConfigInheritable { builds, installers, dist_version, + dist_url_override, allow_dirty, } = self; WorkspaceConfig { @@ -225,6 +232,7 @@ impl WorkspaceConfigInheritable { builds: builds.apply_inheritance_for_workspace(workspaces), installers: installers.apply_inheritance_for_workspace(workspaces), dist_version, + dist_url_override, allow_dirty, } } @@ -241,6 +249,7 @@ impl ApplyLayer for WorkspaceConfigInheritable { ci, allow_dirty, dist_version, + dist_url_override, // app-scope only dist: _, targets: _, @@ -253,6 +262,7 @@ impl ApplyLayer for WorkspaceConfigInheritable { self.installers.apply_val_layer(installers); self.ci.apply_val_layer(ci); self.dist_version.apply_opt(dist_version); + self.dist_url_override.apply_opt(dist_url_override); self.allow_dirty.apply_val(allow_dirty); } } @@ -350,6 +360,7 @@ impl ApplyLayer for AppConfigInheritable { ci: _, allow_dirty: _, dist_version: _, + dist_url_override: _, }: Self::Layer, ) { self.artifacts.apply_val_layer(artifacts); @@ -377,6 +388,10 @@ pub struct TomlLayer { #[serde(skip_serializing_if = "Option::is_none")] pub dist_version: Option, + /// see [`CargoDistUrlOverride`] + #[serde(skip_serializing_if = "Option::is_none")] + pub dist_url_override: Option, + /// Whether the package should be distributed/built by dist /// /// This mainly exists to be set to `false` to make dist ignore the existence of this diff --git a/cargo-dist/src/init.rs b/cargo-dist/src/init.rs index d0a595f86..3da51eabb 100644 --- a/cargo-dist/src/init.rs +++ b/cargo-dist/src/init.rs @@ -359,6 +359,7 @@ fn get_new_dist_metadata( DistMetadata { // If they init with this version we're gonna try to stick to it! cargo_dist_version: Some(std::env!("CARGO_PKG_VERSION").parse().unwrap()), + cargo_dist_url_override: None, // deprecated, default to not emitting it rust_toolchain_version: None, ci: None, @@ -840,6 +841,7 @@ fn apply_dist_to_metadata(metadata: &mut toml_edit::Item, meta: &DistMetadata) { // This is intentionally written awkwardly to make you update this let DistMetadata { cargo_dist_version, + cargo_dist_url_override, rust_toolchain_version, dist, ci, @@ -926,6 +928,13 @@ fn apply_dist_to_metadata(metadata: &mut toml_edit::Item, meta: &DistMetadata) { cargo_dist_version.as_ref().map(|v| v.to_string()), ); + apply_optional_value( + table, + "cargo-dist-url-override", + "# A URL to use to install `cargo-dist` (with the installer script)\n", + cargo_dist_url_override.as_ref().map(|v| v.to_string()), + ); + apply_optional_value( table, "rust-toolchain-version", diff --git a/cargo-dist/templates/ci/github/release.yml.j2 b/cargo-dist/templates/ci/github/release.yml.j2 index a39aa4caf..f378fdc8c 100644 --- a/cargo-dist/templates/ci/github/release.yml.j2 +++ b/cargo-dist/templates/ci/github/release.yml.j2 @@ -127,7 +127,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: {{{ install_dist_sh }}} + run: {{{ dist_install_for_coordinator.run }}} - name: Cache dist uses: actions/upload-artifact@v4 with: @@ -284,7 +284,8 @@ jobs: cache-provider: ${{ matrix.cache_provider }} {{%- endif %}} - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/akaikatana_basic.snap b/cargo-dist/tests/snapshots/akaikatana_basic.snap index 2862d6c83..597e3bdc2 100644 --- a/cargo-dist/tests/snapshots/akaikatana_basic.snap +++ b/cargo-dist/tests/snapshots/akaikatana_basic.snap @@ -2097,7 +2097,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -2106,7 +2109,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -2115,7 +2121,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -2124,7 +2133,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -2262,7 +2274,8 @@ jobs: - name: Use rustup to set correct Rust version run: rustup update "1.67.1" --no-self-update && rustup default "1.67.1" - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/akaikatana_musl.snap b/cargo-dist/tests/snapshots/akaikatana_musl.snap index ef6b7a8e4..e5401d1ef 100644 --- a/cargo-dist/tests/snapshots/akaikatana_musl.snap +++ b/cargo-dist/tests/snapshots/akaikatana_musl.snap @@ -1498,7 +1498,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -1507,7 +1510,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -1516,7 +1522,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" }, @@ -1525,7 +1534,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-musl" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-musl", "packages_install": "sudo apt-get update && sudo apt-get install musl-tools", "cache_provider": "github" @@ -1664,7 +1676,8 @@ jobs: - name: Use rustup to set correct Rust version run: rustup update "1.67.1" --no-self-update && rustup default "1.67.1" - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 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 e3ae4beb6..e1ce68af0 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 @@ -2127,7 +2127,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -2136,7 +2139,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -2145,7 +2151,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -2154,7 +2163,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -2292,7 +2304,8 @@ jobs: - name: Use rustup to set correct Rust version run: rustup update "1.67.1" --no-self-update && rustup default "1.67.1" - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snap b/cargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snap index fa9b67ac6..cb758ccf8 100644 --- a/cargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snap +++ b/cargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snap @@ -2153,7 +2153,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -2162,7 +2165,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -2171,7 +2177,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -2180,7 +2189,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -2318,7 +2330,8 @@ jobs: - name: Use rustup to set correct Rust version run: rustup update "1.67.1" --no-self-update && rustup default "1.67.1" - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/akaikatana_updaters.snap b/cargo-dist/tests/snapshots/akaikatana_updaters.snap index cb868621c..7dc986794 100644 --- a/cargo-dist/tests/snapshots/akaikatana_updaters.snap +++ b/cargo-dist/tests/snapshots/akaikatana_updaters.snap @@ -2137,7 +2137,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -2146,7 +2149,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -2155,7 +2161,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -2164,7 +2173,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -2302,7 +2314,8 @@ jobs: - name: Use rustup to set correct Rust version run: rustup update "1.67.1" --no-self-update && rustup default "1.67.1" - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_abyss.snap b/cargo-dist/tests/snapshots/axolotlsay_abyss.snap index 75b175b1e..3b835cd76 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_abyss.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_abyss.snap @@ -3669,7 +3669,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -3678,7 +3681,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -3687,7 +3693,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -3696,7 +3705,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -3835,7 +3847,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_abyss_only.snap b/cargo-dist/tests/snapshots/axolotlsay_abyss_only.snap index ad5714b4b..c9bd8186e 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_abyss_only.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_abyss_only.snap @@ -3662,7 +3662,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -3671,7 +3674,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -3680,7 +3686,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -3689,7 +3698,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -3821,7 +3833,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_alias.snap b/cargo-dist/tests/snapshots/axolotlsay_alias.snap index e489a6b9a..5ae6135c6 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_alias.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_alias.snap @@ -3710,7 +3710,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -3719,7 +3722,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -3728,7 +3734,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -3737,7 +3746,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -3871,7 +3883,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 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 42af320ca..b3bf3f8f2 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_alias_ignores_missing_bins.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_alias_ignores_missing_bins.snap @@ -3712,7 +3712,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -3721,7 +3724,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -3730,7 +3736,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -3739,7 +3748,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -3873,7 +3885,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_basic.snap b/cargo-dist/tests/snapshots/axolotlsay_basic.snap index b8fb313ac..e7d41aee8 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_basic.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_basic.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -3679,7 +3678,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -3688,7 +3690,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -3697,7 +3702,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -3706,7 +3714,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -3840,7 +3851,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_basic_lies.snap b/cargo-dist/tests/snapshots/axolotlsay_basic_lies.snap index fc4f82002..e390bbd1a 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_basic_lies.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_basic_lies.snap @@ -3781,7 +3781,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -3790,7 +3793,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -3799,7 +3805,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -3808,7 +3817,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -3942,7 +3954,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_build_setup_steps.snap b/cargo-dist/tests/snapshots/axolotlsay_build_setup_steps.snap index a16bb2721..854bad230 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_build_setup_steps.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_build_setup_steps.snap @@ -3678,7 +3678,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -3687,7 +3690,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -3696,7 +3702,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -3705,7 +3714,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -3856,7 +3868,8 @@ jobs: echo $HW shell: "bash" - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_checksum_blake2b.snap b/cargo-dist/tests/snapshots/axolotlsay_checksum_blake2b.snap index 0b90fa616..8a8899605 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_checksum_blake2b.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_checksum_blake2b.snap @@ -1479,7 +1479,10 @@ download_binary_and_run_installer "$@" || exit 1 "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -1488,7 +1491,10 @@ download_binary_and_run_installer "$@" || exit 1 "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -1497,7 +1503,10 @@ download_binary_and_run_installer "$@" || exit 1 "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -1506,7 +1515,10 @@ download_binary_and_run_installer "$@" || exit 1 "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -1640,7 +1652,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_checksum_blake2s.snap b/cargo-dist/tests/snapshots/axolotlsay_checksum_blake2s.snap index 21de91eaa..a4ffbfe9e 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_checksum_blake2s.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_checksum_blake2s.snap @@ -1479,7 +1479,10 @@ download_binary_and_run_installer "$@" || exit 1 "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -1488,7 +1491,10 @@ download_binary_and_run_installer "$@" || exit 1 "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -1497,7 +1503,10 @@ download_binary_and_run_installer "$@" || exit 1 "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -1506,7 +1515,10 @@ download_binary_and_run_installer "$@" || exit 1 "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -1640,7 +1652,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_checksum_sha3_256.snap b/cargo-dist/tests/snapshots/axolotlsay_checksum_sha3_256.snap index e2d49d081..b5d7c2fd1 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_checksum_sha3_256.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_checksum_sha3_256.snap @@ -1479,7 +1479,10 @@ download_binary_and_run_installer "$@" || exit 1 "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -1488,7 +1491,10 @@ download_binary_and_run_installer "$@" || exit 1 "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -1497,7 +1503,10 @@ download_binary_and_run_installer "$@" || exit 1 "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -1506,7 +1515,10 @@ download_binary_and_run_installer "$@" || exit 1 "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -1640,7 +1652,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_checksum_sha3_512.snap b/cargo-dist/tests/snapshots/axolotlsay_checksum_sha3_512.snap index 166a4f6c4..4e6158d4e 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_checksum_sha3_512.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_checksum_sha3_512.snap @@ -1479,7 +1479,10 @@ download_binary_and_run_installer "$@" || exit 1 "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -1488,7 +1491,10 @@ download_binary_and_run_installer "$@" || exit 1 "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -1497,7 +1503,10 @@ download_binary_and_run_installer "$@" || exit 1 "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -1506,7 +1515,10 @@ download_binary_and_run_installer "$@" || exit 1 "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -1640,7 +1652,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_custom_formula.snap b/cargo-dist/tests/snapshots/axolotlsay_custom_formula.snap index 40b7da6d5..7cd0f601c 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_custom_formula.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_custom_formula.snap @@ -334,7 +334,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -343,7 +346,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -352,7 +358,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -361,7 +370,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -485,7 +497,8 @@ jobs: key: ${{ join(matrix.targets, '-') }} cache-provider: ${{ matrix.cache_provider }} - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_custom_github_runners.snap b/cargo-dist/tests/snapshots/axolotlsay_custom_github_runners.snap index 76730ee32..7b72d4b44 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_custom_github_runners.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_custom_github_runners.snap @@ -256,7 +256,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-unknown-linux-gnu" ], "runner": "buildjet-8vcpu-ubuntu-2204-arm", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-unknown-linux-gnu", "cache_provider": "buildjet" }, @@ -265,7 +268,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-unknown-linux-musl" ], "runner": "buildjet-8vcpu-ubuntu-2204-arm", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-unknown-linux-musl", "packages_install": "sudo apt-get update && sudo apt-get install musl-tools", "cache_provider": "buildjet" @@ -275,7 +281,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "buildjet-8vcpu-ubuntu-2204", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "buildjet" }, @@ -284,7 +293,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-musl" ], "runner": "buildjet-8vcpu-ubuntu-2204", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-musl", "packages_install": "sudo apt-get update && sudo apt-get install musl-tools", "cache_provider": "buildjet" @@ -419,7 +431,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_disable_source_tarball.snap b/cargo-dist/tests/snapshots/axolotlsay_disable_source_tarball.snap index 22a8ef69b..4dec9a145 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_disable_source_tarball.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_disable_source_tarball.snap @@ -3666,7 +3666,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) axolotlsay-n "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -3675,7 +3678,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) axolotlsay-n "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -3684,7 +3690,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) axolotlsay-n "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -3693,7 +3702,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) axolotlsay-n "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -3827,7 +3839,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_dispatch.snap b/cargo-dist/tests/snapshots/axolotlsay_dispatch.snap index 482a1b97d..be5bc82c4 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_dispatch.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_dispatch.snap @@ -256,7 +256,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -265,7 +268,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -274,7 +280,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -283,7 +292,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -421,7 +433,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_dispatch_abyss.snap b/cargo-dist/tests/snapshots/axolotlsay_dispatch_abyss.snap index edb9611d3..62e9d9879 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_dispatch_abyss.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_dispatch_abyss.snap @@ -264,7 +264,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -273,7 +276,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -282,7 +288,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -291,7 +300,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -431,7 +443,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_dispatch_abyss_only.snap b/cargo-dist/tests/snapshots/axolotlsay_dispatch_abyss_only.snap index acc3685a4..94327fdc4 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_dispatch_abyss_only.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_dispatch_abyss_only.snap @@ -257,7 +257,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -266,7 +269,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -275,7 +281,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -284,7 +293,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -420,7 +432,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_edit_existing.snap b/cargo-dist/tests/snapshots/axolotlsay_edit_existing.snap index a4faddf8f..36d4536a2 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_edit_existing.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_edit_existing.snap @@ -3600,7 +3600,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -3609,7 +3612,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -3618,7 +3624,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -3627,7 +3636,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -3761,7 +3773,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_generic_workspace_basic.snap b/cargo-dist/tests/snapshots/axolotlsay_generic_workspace_basic.snap index 8f1418c01..c8c47fbac 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_generic_workspace_basic.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_generic_workspace_basic.snap @@ -4112,7 +4112,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -4121,7 +4124,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -4130,7 +4136,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -4139,7 +4148,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -4277,7 +4289,8 @@ jobs: key: ${{ join(matrix.targets, '-') }} cache-provider: ${{ matrix.cache_provider }} - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_homebrew_packages.snap b/cargo-dist/tests/snapshots/axolotlsay_homebrew_packages.snap index 476ea41dc..45ae2b51b 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_homebrew_packages.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_homebrew_packages.snap @@ -3678,7 +3678,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "packages_install": "cat << EOF >Brewfile\ncask \"homebrew/cask/macfuse\"\nbrew \"libcue\"\nEOF\n\nbrew bundle install", "cache_provider": "github" @@ -3688,7 +3691,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "packages_install": "cat << EOF >Brewfile\ncask \"homebrew/cask/macfuse\"\nbrew \"libcue\"\nEOF\n\nbrew bundle install", "cache_provider": "github" @@ -3698,7 +3704,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -3707,7 +3716,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -3841,7 +3853,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_musl.snap b/cargo-dist/tests/snapshots/axolotlsay_musl.snap index 036c6012e..b93d59ca8 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_musl.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_musl.snap @@ -2993,7 +2993,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -3002,7 +3005,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -3011,7 +3017,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" }, @@ -3020,7 +3029,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-musl" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-musl", "packages_install": "sudo apt-get update && sudo apt-get install musl-tools", "cache_provider": "github" @@ -3155,7 +3167,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_musl_no_gnu.snap b/cargo-dist/tests/snapshots/axolotlsay_musl_no_gnu.snap index b99a8bd67..2fcc0e98b 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_musl_no_gnu.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_musl_no_gnu.snap @@ -2928,7 +2928,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -2937,7 +2940,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -2946,7 +2952,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-musl" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-musl", "packages_install": "sudo apt-get update && sudo apt-get install musl-tools", "cache_provider": "github" @@ -3081,7 +3090,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_no_homebrew_publish.snap b/cargo-dist/tests/snapshots/axolotlsay_no_homebrew_publish.snap index ac91362e0..eda82e205 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_no_homebrew_publish.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_no_homebrew_publish.snap @@ -3600,7 +3600,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -3609,7 +3612,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -3618,7 +3624,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -3627,7 +3636,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -3765,7 +3777,8 @@ jobs: key: ${{ join(matrix.targets, '-') }} cache-provider: ${{ matrix.cache_provider }} - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_no_locals.snap b/cargo-dist/tests/snapshots/axolotlsay_no_locals.snap index d65265890..7fce42d42 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_no_locals.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_no_locals.snap @@ -256,7 +256,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -265,7 +268,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -274,7 +280,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -283,7 +292,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } 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 a1a85873c..7a8697417 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_no_locals_but_custom.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_no_locals_but_custom.snap @@ -256,7 +256,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -265,7 +268,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -274,7 +280,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -283,7 +292,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } diff --git a/cargo-dist/tests/snapshots/axolotlsay_several_aliases.snap b/cargo-dist/tests/snapshots/axolotlsay_several_aliases.snap index 359664bd5..66f16e920 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_several_aliases.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_several_aliases.snap @@ -3716,7 +3716,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -3725,7 +3728,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -3734,7 +3740,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -3743,7 +3752,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -3877,7 +3889,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign.snap b/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign.snap index 37bd15278..5e0722a7e 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign.snap @@ -2090,7 +2090,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -2099,7 +2102,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -2108,7 +2114,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -2117,7 +2126,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -2255,7 +2267,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 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 37bd15278..5e0722a7e 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign_prod.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign_prod.snap @@ -2090,7 +2090,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -2099,7 +2102,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -2108,7 +2114,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -2117,7 +2126,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -2255,7 +2267,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_tag_namespace.snap b/cargo-dist/tests/snapshots/axolotlsay_tag_namespace.snap index cb1b6c6f3..75bd880fa 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_tag_namespace.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_tag_namespace.snap @@ -256,7 +256,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -265,7 +268,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -274,7 +280,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -283,7 +292,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -417,7 +429,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_updaters.snap b/cargo-dist/tests/snapshots/axolotlsay_updaters.snap index 6db589085..2fcb8b01d 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_updaters.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_updaters.snap @@ -3718,7 +3718,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -3727,7 +3730,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -3736,7 +3742,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -3745,7 +3754,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -3879,7 +3891,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 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 7a93b22af..003ffabf4 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_user_global_build_job.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_user_global_build_job.snap @@ -3600,7 +3600,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -3609,7 +3612,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -3618,7 +3624,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -3627,7 +3636,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -3761,7 +3773,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_user_host_job.snap b/cargo-dist/tests/snapshots/axolotlsay_user_host_job.snap index d51087a47..b09728744 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_user_host_job.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_user_host_job.snap @@ -3600,7 +3600,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -3609,7 +3612,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -3618,7 +3624,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -3627,7 +3636,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -3761,7 +3773,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 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 2537d1285..1d102c6ce 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_user_local_build_job.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_user_local_build_job.snap @@ -3600,7 +3600,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -3609,7 +3612,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -3618,7 +3624,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -3627,7 +3636,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -3761,7 +3773,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_user_plan_job.snap b/cargo-dist/tests/snapshots/axolotlsay_user_plan_job.snap index a3e6c7737..0b3d98cb6 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_user_plan_job.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_user_plan_job.snap @@ -3600,7 +3600,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -3609,7 +3612,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -3618,7 +3624,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -3627,7 +3636,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -3775,7 +3787,8 @@ jobs: key: ${{ join(matrix.targets, '-') }} cache-provider: ${{ matrix.cache_provider }} - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/axolotlsay_user_publish_job.snap b/cargo-dist/tests/snapshots/axolotlsay_user_publish_job.snap index 721a49227..e008474ca 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_user_publish_job.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_user_publish_job.snap @@ -3600,7 +3600,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -3609,7 +3612,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -3618,7 +3624,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -3627,7 +3636,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } @@ -3761,7 +3773,8 @@ jobs: with: submodules: recursive - name: Install dist - run: ${{ matrix.install_dist }} + shell: ${{ matrix.install_dist.shell }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/cargo-dist/tests/snapshots/install_path_cargo_home.snap b/cargo-dist/tests/snapshots/install_path_cargo_home.snap index c15fc0916..f735ed7f3 100644 --- a/cargo-dist/tests/snapshots/install_path_cargo_home.snap +++ b/cargo-dist/tests/snapshots/install_path_cargo_home.snap @@ -2090,7 +2090,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -2099,7 +2102,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -2108,7 +2114,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -2117,7 +2126,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } 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 8fa009de0..13b712fb6 100644 --- a/cargo-dist/tests/snapshots/install_path_env_no_subdir.snap +++ b/cargo-dist/tests/snapshots/install_path_env_no_subdir.snap @@ -2066,7 +2066,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -2075,7 +2078,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -2084,7 +2090,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -2093,7 +2102,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } diff --git a/cargo-dist/tests/snapshots/install_path_env_subdir.snap b/cargo-dist/tests/snapshots/install_path_env_subdir.snap index 9a520d617..8a17c8309 100644 --- a/cargo-dist/tests/snapshots/install_path_env_subdir.snap +++ b/cargo-dist/tests/snapshots/install_path_env_subdir.snap @@ -2066,7 +2066,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -2075,7 +2078,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -2084,7 +2090,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -2093,7 +2102,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } 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 50d23ab2f..b6e2b3b31 100644 --- a/cargo-dist/tests/snapshots/install_path_env_subdir_space.snap +++ b/cargo-dist/tests/snapshots/install_path_env_subdir_space.snap @@ -2066,7 +2066,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -2075,7 +2078,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -2084,7 +2090,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -2093,7 +2102,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } 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 3de80a5ad..acbb0b81e 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 @@ -2066,7 +2066,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -2075,7 +2078,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -2084,7 +2090,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -2093,7 +2102,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } 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 39002b47f..b06a5bac8 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 @@ -2089,7 +2089,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -2098,7 +2101,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -2107,7 +2113,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -2116,7 +2125,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } 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 16b0160c0..ee7208d1d 100644 --- a/cargo-dist/tests/snapshots/install_path_home_subdir_deeper.snap +++ b/cargo-dist/tests/snapshots/install_path_home_subdir_deeper.snap @@ -2066,7 +2066,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -2075,7 +2078,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -2084,7 +2090,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -2093,7 +2102,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } 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 5b4cbd263..ae75286fb 100644 --- a/cargo-dist/tests/snapshots/install_path_home_subdir_min.snap +++ b/cargo-dist/tests/snapshots/install_path_home_subdir_min.snap @@ -2066,7 +2066,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -2075,7 +2078,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -2084,7 +2090,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -2093,7 +2102,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } 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 f4043d7ad..60f682907 100644 --- a/cargo-dist/tests/snapshots/install_path_home_subdir_space.snap +++ b/cargo-dist/tests/snapshots/install_path_home_subdir_space.snap @@ -2066,7 +2066,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -2075,7 +2078,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -2084,7 +2090,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -2093,7 +2102,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } 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 098f6befd..9cfeadebe 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 @@ -2066,7 +2066,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -2075,7 +2078,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -2084,7 +2090,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -2093,7 +2102,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } 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 25f16fcc6..6f55b70eb 100644 --- a/cargo-dist/tests/snapshots/install_path_no_fallback_taken.snap +++ b/cargo-dist/tests/snapshots/install_path_no_fallback_taken.snap @@ -2089,7 +2089,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "aarch64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -2098,7 +2101,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-apple-darwin" ], "runner": "macos-13", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -2107,7 +2113,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "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\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -2116,7 +2125,10 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "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": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" } diff --git a/cargo-dist/tests/snapshots/manifest.snap b/cargo-dist/tests/snapshots/manifest.snap index 8db874264..0b53b1a1a 100644 --- a/cargo-dist/tests/snapshots/manifest.snap +++ b/cargo-dist/tests/snapshots/manifest.snap @@ -525,7 +525,10 @@ stdout: "aarch64-apple-darwin" ], "runner": "macos-13", - "install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v1.0.0-FAKEVERSION/cargo-dist-installer.sh | sh", + "install_dist": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v1.0.0-FAKEVERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-apple-darwin", "cache_provider": "github" }, @@ -534,7 +537,10 @@ stdout: "aarch64-unknown-linux-gnu" ], "runner": "buildjet-8vcpu-ubuntu-2204-arm", - "install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v1.0.0-FAKEVERSION/cargo-dist-installer.sh | sh", + "install_dist": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v1.0.0-FAKEVERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-unknown-linux-gnu", "cache_provider": "buildjet" }, @@ -543,7 +549,10 @@ stdout: "aarch64-unknown-linux-musl" ], "runner": "buildjet-8vcpu-ubuntu-2204-arm", - "install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v1.0.0-FAKEVERSION/cargo-dist-installer.sh | sh", + "install_dist": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v1.0.0-FAKEVERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=aarch64-unknown-linux-musl", "packages_install": "sudo apt-get update && sudo apt-get install musl-tools", "cache_provider": "buildjet" @@ -553,7 +562,10 @@ stdout: "x86_64-apple-darwin" ], "runner": "macos-13", - "install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v1.0.0-FAKEVERSION/cargo-dist-installer.sh | sh", + "install_dist": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v1.0.0-FAKEVERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-apple-darwin", "cache_provider": "github" }, @@ -562,7 +574,10 @@ stdout: "x86_64-pc-windows-msvc" ], "runner": "windows-2019", - "install_dist": "powershell -c \"irm https://github.com/axodotdev/cargo-dist/releases/download/v1.0.0-FAKEVERSION/cargo-dist-installer.ps1 | iex\"", + "install_dist": { + "shell": "pwsh", + "run": "irm https://github.com/axodotdev/cargo-dist/releases/download/v1.0.0-FAKEVERSION/cargo-dist-installer.ps1 | iex" + }, "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc", "cache_provider": "github" }, @@ -571,7 +586,10 @@ stdout: "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v1.0.0-FAKEVERSION/cargo-dist-installer.sh | sh", + "install_dist": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v1.0.0-FAKEVERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu", "cache_provider": "github" }, @@ -580,7 +598,10 @@ stdout: "x86_64-unknown-linux-musl" ], "runner": "ubuntu-20.04", - "install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v1.0.0-FAKEVERSION/cargo-dist-installer.sh | sh", + "install_dist": { + "shell": "sh", + "run": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v1.0.0-FAKEVERSION/cargo-dist-installer.sh | sh" + }, "dist_args": "--artifacts=local --target=x86_64-unknown-linux-musl", "packages_install": "sudo apt-get update && sudo apt-get install musl-tools", "cache_provider": "github" diff --git a/dist-workspace.toml b/dist-workspace.toml index 00cb8cc05..bd8c0e678 100644 --- a/dist-workspace.toml +++ b/dist-workspace.toml @@ -4,7 +4,7 @@ members = ["cargo:."] # Config for 'dist' [dist] # The preferred dist version to use in CI (Cargo.toml SemVer syntax) -cargo-dist-version = "0.24.0-prerelease.2" +cargo-dist-version = "0.24.1" # CI backends to support ci = "github" # The installers to generate for each app