Repository: axodotdev/cargo-dist
Pull request #140 (2023-02-16 22:50:19)

purge github- prefix from installers


Patch:
diff --git a/Cargo.toml b/Cargo.toml
index 4b5043b0..09c2275d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,7 @@ rust-toolchain-version = "1.67.1"
 # CI backends to support (see 'cargo dist generate-ci')
 ci = ["github"]
 # The installers to generate for each app
-installers = ["github-shell", "github-powershell"]
+installers = ["shell", "powershell"]
 # Target platforms to build apps for (Rust target-triple syntax)
 targets = ["x86_64-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-pc-windows-msvc"]
 
diff --git a/README.md b/README.md
index 8242a588..6631f3b6 100644
--- a/README.md
+++ b/README.md
@@ -124,13 +124,13 @@ paru -S cargo-dist
 Linux and macOS:
 
 ```sh
-curl --proto '=https' --tlsv1.2 -L -sSf https://github.com/axodotdev/cargo-dist/releases/download/v0.0.1/installer.sh | sh
+curl --proto '=https' --tlsv1.2 -L -sSf https://github.com/axodotdev/cargo-dist/releases/download/v0.0.2/installer.sh | sh
 ```
 
 Windows PowerShell:
 
 ```sh
-irm 'https://github.com/axodotdev/cargo-dist/releases/download/v0.0.1/installer.ps1' | iex
+irm 'https://github.com/axodotdev/cargo-dist/releases/download/v0.0.2/installer.ps1' | iex
 ```
 
 # Setup
@@ -157,9 +157,11 @@ cargo dist init
 If you want to just (re)generate the ci scripts, you can do:
 
 ```sh
-cargo dist generate-ci github
+cargo dist generate-ci
 ```
 
+(This assumes you have set `ci = ["github"]` in your Cargo.toml, which you should do so that things like installers understand that Github Releases are a place to fetch artifacts from. You *can* pass "github" to generate-ci to test it out, but it won't persist. Maybe that UX should be reworked.)
+
 See the next section ("Usage (CI)") for how the github workflow is triggered and what it does.
 
 
@@ -170,7 +172,7 @@ If you would like to generate (still under development) installer scripts, you c
 to either `init` or `generate-ci`:
 
 ```sh
-cargo dist init --ci=github --installer=github-shell --installer=github-powershell
+cargo dist init --ci=github --installer=shell --installer=powershell
 ```
 
 This will result in `installer.sh` and `installer.ps1` being generated which fetch from a Github Release™️ and copy the binaries to `$HOME/.cargo/bin/` on the assumption that this is on your PATH. The scripts are currently brittle and won't properly tell Cargo about the installation (making `cargo uninstall` and some other commands behave incorrectly). As such they're currently only really appropriate for setting up temporary environments like CI without any other binaries. This will be improved in the future.
@@ -234,7 +236,7 @@ cargo-release will then automatically:
 
 When you *do* push a tag (and the commit it points to) the CI will take over and do the following:
 
-1. Create a *draft* Github Release™️ (with [taiki-e/create-github-release-action](https://github.com/taiki-e/create-gh-release-action))
+1. Create a *draft* Github Release™️
 2. Build your application for all the target platforms, wrap them in zips/tars, and upload them to the Github Release™️
 3. (Optional, see setup) Build installer scripts that fetch from the Github Release™️
 4. Generate a [dist-manifest.json](https://github.com/axodotdev/cargo-dist/tree/main/cargo-dist-schema) describing all the artifacts and upload it to the Github Release™️
@@ -242,8 +244,6 @@ When you *do* push a tag (and the commit it points to) the CI will take over and
 
 The reason we do this extra dance with drafts is that we don't want to notify anyone of the release until it's Complete, but also don't want to lose anything if some only some of the build tasks failed.
 
-[taiki-e/create-github-release-action](https://github.com/taiki-e/create-gh-release-action) has some support for automatically parsing a CHANGELOG.md file to populate the text of the release. For now you will need to manually enable that by editing `release.yml`.
-
 
 
 
@@ -384,16 +384,16 @@ If you know you like the changes, just use `cargo insta accept` to auto-apply al
 
 ## Cutting Releases
 
-cargo-dist is self-hosting, so just follow the usual [usage instructions](#usage-ci) and publish with `cargo release`!
+cargo-dist is self-hosting, so just follow the usual [usage instructions](#usage-ci) and publish with `cargo release 1.0.0`! (Or whatever cooler version you prefer.)
 
 The CI is (re)generated with:
 
 ```
-cargo dist generate-ci github --installer=github-shell --installer=github-powershell
+cargo dist generate-ci
 ```
 
-**Including the installers is very important, as all the CI scripts cargo-dist generates for *other* projects will bootstrap dist with those installers.**
+**NOTE: if you want to update the version of cargo-dist used in the CI, you need to update cargo-dist-version in the root Cargo.toml! I keep forgetting this and should add a feature to help this this! Yeah! Looking at you, Future Me Who Still Hasn't Done This!**
 
 Note that as a consequence of the way we self-host, cargo-dist's published artifacts will always be built/generated by a previous version of itself. This can be problematic if you make breaking changes to cargo-dist-schema's format... so don't! Many things in the schema are intentionally optional to enable forward and backward compatibility, so this should hopefully work well!
 
-(Future work: mark `cargo release` do more magic like cutting CHANGELOG.md and whatnot.)
+(Future work: mark `cargo release` do more magic like cutting RELEASES.md and whatnot?)
diff --git a/RELEASES.md b/RELEASES.md
index b65bafed..db08e97f 100644
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -17,7 +17,7 @@ The following settings can *only* be set in `[workspace]`:
 The following settings can be set on either `[workspace]` or `[package]`, with the latter overriding the former:
 
 * dist: (bool, defaults to "undefined") whether this package's binaries should be visible to cargo-dist for the purposes of Releases. If undefined, we will defer to cargo's own publish=false config. Packages without binaries are always invisible to cargo-dist.
-* installers: (list of installer kinds) the default set of installers to generate for releases (currently only "github-shell" and "github-powershell" are defined)
+* installers: (list of installer kinds) the default set of installers to generate for releases (currently only "shell" and "powershell" are defined)
 * targets: (list of rust-style target-triples) the default set of targets to use for releases (sort of, see the section on CLI configuration)
 * include: (list of paths relative to that Cargo.toml's dir) extra files to include in executable-zips (does not currently support directories or wildcards, individual files only)
 * auto-includes: (bool, defaults true) whether dist should add README/LICENSE/etc files to your executable-zips when it finds them.
@@ -113,6 +113,7 @@ Release notes are now temporarily simplified for reliability:
 * Installer artifacts are now properly prefixed with the id of the Release they're part of, preventing conflicts when doing multiple Releases at once (installer.sh => my-app-v1.0.0-installer.sh).
 * Installers now properly handle packages that define multiple binaries (installing all of them, just like cargo-install)
 * Installers now properly know the Github Release they are going to point to (previously they would guess based on the version of the package which was broken in complicated workflows)
+* --installer=github-shell and --installer=github-powershell have had the "github-" prefix removed. They now generically use the concept of an "artifact download url" which will be configurable in the future (for now it only gets populated if ci=github is set and your workspace has a coherent definition for "repository" in its Cargo.tomls).
 
 
 
diff --git a/cargo-dist/src/cli.rs b/cargo-dist/src/cli.rs
index 4bacc60f..d5ec0be5 100644
--- a/cargo-dist/src/cli.rs
+++ b/cargo-dist/src/cli.rs
@@ -222,18 +222,18 @@ impl CiStyle {
 /// A style of installer to generate
 #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, ValueEnum)]
 pub enum InstallerStyle {
-    /// Generates a shell script that fetches from github ci
-    GithubShell,
-    /// Generates a powershell script that fetches from github ci
-    GithubPowershell,
+    /// Generates a shell script that fetches from your Artifact Download URL (Github Release for now)
+    Shell,
+    /// Generates a shell script that fetches from your Artifact Download URL (Github Release for now)
+    Powershell,
 }
 
 impl InstallerStyle {
     /// Convert the application version of this enum to the library version
     pub fn to_lib(self) -> cargo_dist::InstallerStyle {
         match self {
-            InstallerStyle::GithubShell => cargo_dist::InstallerStyle::GithubShell,
-            InstallerStyle::GithubPowershell => cargo_dist::InstallerStyle::GithubPowershell,
+            InstallerStyle::Shell => cargo_dist::InstallerStyle::Shell,
+            InstallerStyle::Powershell => cargo_dist::InstallerStyle::Powershell,
         }
     }
 }
diff --git a/cargo-dist/src/installer.ps1 b/cargo-dist/src/installer.ps1
index eb244e33..38163bb2 100644
--- a/cargo-dist/src/installer.ps1
+++ b/cargo-dist/src/installer.ps1
@@ -4,7 +4,7 @@
 # except according to those terms.
 
 # This is just a little script that can be downloaded from the internet to
-# install an app. It downloads the tarball from GitHub releases,
+# install an app. It downloads the tarball from artifact_download_url,
 # and extracts it to ~/.cargo/bin/
 #
 # In the future this script will gain extra features, but for now it's
diff --git a/cargo-dist/src/installer.rs b/cargo-dist/src/installer.rs
index 76d8f415..2f4c02cd 100644
--- a/cargo-dist/src/installer.rs
+++ b/cargo-dist/src/installer.rs
@@ -9,10 +9,10 @@ use miette::{Context, IntoDiagnostic};
 use crate::{DistGraph, InstallerInfo, ZipStyle};
 
 ////////////////////////////////////////////////////////////////
-// Github Shell
+// Shell Installer
 ////////////////////////////////////////////////////////////////
 
-pub(crate) fn generate_github_install_sh_script(
+pub(crate) fn generate_install_sh_script(
     dist: &DistGraph,
     info: &InstallerInfo,
 ) -> Result<(), miette::Report> {
@@ -20,13 +20,13 @@ pub(crate) fn generate_github_install_sh_script(
     let mut file = File::create(installer_file)
         .into_diagnostic()
         .wrap_err_with(|| format!("Failed to create installer file {installer_file}"))?;
-    write_github_install_sh_script(&mut file, dist, info)
+    write_install_sh_script(&mut file, dist, info)
         .into_diagnostic()
         .wrap_err_with(|| format!("Failed to write to installer file {installer_file}"))?;
     Ok(())
 }
 
-fn write_github_install_sh_script<W: std::io::Write>(
+fn write_install_sh_script<W: std::io::Write>(
     f: &mut W,
     _dist: &DistGraph,
     info: &InstallerInfo,
@@ -89,10 +89,10 @@ fn write_github_install_sh_script<W: std::io::Write>(
 }
 
 ////////////////////////////////////////////////////////////////
-// Github Powershell
+// Powershell Installer
 ////////////////////////////////////////////////////////////////
 
-pub(crate) fn generate_github_install_ps_script(
+pub(crate) fn generate_install_ps_script(
     dist: &DistGraph,
     info: &InstallerInfo,
 ) -> Result<(), miette::Report> {
@@ -100,13 +100,13 @@ pub(crate) fn generate_github_install_ps_script(
     let mut file = File::create(installer_file)
         .into_diagnostic()
         .wrap_err_with(|| format!("Failed to create installer file {installer_file}"))?;
-    write_github_install_ps_script(&mut file, dist, info)
+    write_install_ps_script(&mut file, dist, info)
         .into_diagnostic()
         .wrap_err_with(|| format!("Failed to write to installer file {installer_file}"))?;
     Ok(())
 }
 
-fn write_github_install_ps_script<W: std::io::Write>(
+fn write_install_ps_script<W: std::io::Write>(
     f: &mut W,
     _dist: &DistGraph,
     info: &InstallerInfo,
diff --git a/cargo-dist/src/installer.sh b/cargo-dist/src/installer.sh
index f4450b2c..0b23c5a2 100644
--- a/cargo-dist/src/installer.sh
+++ b/cargo-dist/src/installer.sh
@@ -6,7 +6,7 @@
 # except according to those terms.
 
 # This is just a little script that can be downloaded from the internet to
-# install $APP_NAME. It downloads the tarball from GitHub releases,
+# install $APP_NAME. It downloads the tarball from ARTIFACT_DOWNLOAD_URL,
 # and extracts it to ~/.cargo/bin/
 #
 # In the future this script will gain extra features, but for now it's
diff --git a/cargo-dist/src/lib.rs b/cargo-dist/src/lib.rs
index a510b6e1..7e0ef414 100644
--- a/cargo-dist/src/lib.rs
+++ b/cargo-dist/src/lib.rs
@@ -176,9 +176,7 @@ fn manifest_artifact(
             description = None;
             kind = cargo_dist_schema::ArtifactKind::Symbols;
         }
-        ArtifactKind::Installer(
-            InstallerImpl::GithubPowershell(info) | InstallerImpl::GithubShell(info),
-        ) => {
+        ArtifactKind::Installer(InstallerImpl::Powershell(info) | InstallerImpl::Shell(info)) => {
             install_hint = Some(info.hint.clone());
             description = Some(info.desc.clone());
             kind = cargo_dist_schema::ArtifactKind::Installer;
@@ -827,8 +825,8 @@ fn init_dist_metadata(cfg: &Config, workspace_toml: &mut toml_edit::Document) ->
             Item::Value(
                 val.iter()
                     .map(|installer| match installer {
-                        InstallerStyle::GithubPowershell => "github-powershell",
-                        InstallerStyle::GithubShell => "github-shell",
+                        InstallerStyle::Powershell => "powershell",
+                        InstallerStyle::Shell => "shell",
                     })
                     .collect(),
             ),
@@ -899,11 +897,7 @@ pub fn do_generate_ci(cfg: &Config, _args: &GenerateCiArgs) -> Result<()> {
 /// Build a cargo target
 fn generate_installer(dist: &DistGraph, style: &InstallerImpl) -> Result<()> {
     match style {
-        InstallerImpl::GithubShell(info) => {
-            installer::generate_github_install_sh_script(dist, info)
-        }
-        InstallerImpl::GithubPowershell(info) => {
-            installer::generate_github_install_ps_script(dist, info)
-        }
+        InstallerImpl::Shell(info) => installer::generate_install_sh_script(dist, info),
+        InstallerImpl::Powershell(info) => installer::generate_install_ps_script(dist, info),
     }
 }
diff --git a/cargo-dist/src/tasks.rs b/cargo-dist/src/tasks.rs
index 4ab47ac4..ed07fe72 100644
--- a/cargo-dist/src/tasks.rs
+++ b/cargo-dist/src/tasks.rs
@@ -157,10 +157,8 @@ pub struct DistMetadata {
     ///
     /// Currently accepted values:
     ///
-    /// * github-shell
-    /// * github-powershell
-    ///
-    /// (In the future the github- prefix might be removed, these are pretty generic now!)
+    /// * shell
+    /// * powershell
     #[serde(default)]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub installers: Option<Vec<InstallerStyle>>,
@@ -293,12 +291,12 @@ pub enum CiStyle {
 /// The style of Installer we should generate
 #[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq, Eq)]
 pub enum InstallerStyle {
-    /// Generate a shell script that fetches from a Github Release
-    #[serde(rename = "github-shell")]
-    GithubShell,
-    /// Generate a powershell script that fetches from a Github Release
-    #[serde(rename = "github-powershell")]
-    GithubPowershell,
+    /// Generate a shell script that fetches from [`DistGraph::artifact_download_url`][]
+    #[serde(rename = "shell")]
+    Shell,
+    /// Generate a powershell script that fetches from [`DistGraph::artifact_download_url`][]
+    #[serde(rename = "powershell")]
+    Powershell,
 }
 
 /// A unique id for a [`Artifact`][]
@@ -633,10 +631,10 @@ impl ZipStyle {
 /// A kind of an installer
 #[derive(Debug, Clone)]
 pub enum InstallerImpl {
-    /// Github Releases shell installer script
-    GithubShell(InstallerInfo),
-    /// Github Releases powershell installer script
-    GithubPowershell(InstallerInfo),
+    /// shell installer script
+    Shell(InstallerInfo),
+    /// powershell installer script
+    Powershell(InstallerInfo),
 }
 
 /// Generic info about an installer
@@ -757,7 +755,7 @@ pub struct PackageInfo {
     /// might also use it for auto-detecting "hey you're using github, here's the
     /// recommended github setup".
     ///
-    /// i.e. `--installer=github-shell` uses this as the base URL for fetching from
+    /// i.e. `--installer=shell` uses this as the base URL for fetching from
     /// a Github Release™️.
     pub repository_url: Option<String>,
     /// URL to the homepage for this package.
@@ -1070,19 +1068,19 @@ impl<'pkg_graph> DistGraphBuilder<'pkg_graph> {
 
     fn add_installer(&mut self, to_release: ReleaseIdx, installer: &InstallerStyle) {
         match installer {
-            InstallerStyle::GithubShell => self.add_github_shell_installer(to_release),
-            InstallerStyle::GithubPowershell => self.add_github_powershell_installer(to_release),
+            InstallerStyle::Shell => self.add_shell_installer(to_release),
+            InstallerStyle::Powershell => self.add_powershell_installer(to_release),
         }
     }
 
-    fn add_github_shell_installer(&mut self, to_release: ReleaseIdx) {
+    fn add_shell_installer(&mut self, to_release: ReleaseIdx) {
         if !self.global_artifacts_enabled() {
             return;
         }
         let release = self.release(to_release);
         let release_id = &release.id;
         let Some(download_url) = &self.inner.artifact_download_url else {
-            warn!("skipping github-shell installer: couldn't compute a URL to download artifacts from");
+            warn!("skipping shell installer: couldn't compute a URL to download artifacts from");
             return;
         };
         let artifact_name = format!("{release_id}-installer.sh");
@@ -1119,7 +1117,7 @@ impl<'pkg_graph> DistGraphBuilder<'pkg_graph> {
             });
         }
         if artifacts.is_empty() {
-            warn!("skipping github-shell installer: not building any supported platforms (use --artifacts=global)");
+            warn!("skipping shell installer: not building any supported platforms (use --artifacts=global)");
             return;
         };
 
@@ -1130,7 +1128,7 @@ impl<'pkg_graph> DistGraphBuilder<'pkg_graph> {
             dir_path: None,
             file_path: artifact_path.clone(),
             required_binaries: FastMap::new(),
-            kind: ArtifactKind::Installer(InstallerImpl::GithubShell(InstallerInfo {
+            kind: ArtifactKind::Installer(InstallerImpl::Shell(InstallerInfo {
                 dest_path: artifact_path,
                 app_name: release.app_name.clone(),
                 app_version: release.version.to_string(),
@@ -1144,7 +1142,7 @@ impl<'pkg_graph> DistGraphBuilder<'pkg_graph> {
         self.add_global_artifact(to_release, installer_artifact);
     }
 
-    fn add_github_powershell_installer(&mut self, to_release: ReleaseIdx) {
+    fn add_powershell_installer(&mut self, to_release: ReleaseIdx) {
         if !self.global_artifacts_enabled() {
             return;
         }
@@ -1153,7 +1151,7 @@ impl<'pkg_graph> DistGraphBuilder<'pkg_graph> {
         let release = self.release(to_release);
         let release_id = &release.id;
         let Some(download_url) = &self.inner.artifact_download_url else {
-            warn!("skipping github-powershell installer: couldn't compute a URL to download artifacts from");
+            warn!("skipping powershell installer: couldn't compute a URL to download artifacts from");
             return;
         };
         let artifact_name = format!("{release_id}-installer.ps1");
@@ -1190,7 +1188,7 @@ impl<'pkg_graph> DistGraphBuilder<'pkg_graph> {
             });
         }
         if artifacts.is_empty() {
-            warn!("skipping github-powershell installer: not building any supported platforms (use --artifacts=global)");
+            warn!("skipping powershell installer: not building any supported platforms (use --artifacts=global)");
             return;
         };
 
@@ -1201,7 +1199,7 @@ impl<'pkg_graph> DistGraphBuilder<'pkg_graph> {
             dir_path: None,
             file_path: artifact_path.clone(),
             required_binaries: FastMap::new(),
-            kind: ArtifactKind::Installer(InstallerImpl::GithubPowershell(InstallerInfo {
+            kind: ArtifactKind::Installer(InstallerImpl::Powershell(InstallerInfo {
                 dest_path: artifact_path,
                 app_name: release.app_name.clone(),
                 app_version: release.version.to_string(),
@@ -1486,8 +1484,7 @@ impl<'pkg_graph> DistGraphBuilder<'pkg_graph> {
             if !global_installers.is_empty() {
                 writeln!(gh_body, "## Install {heading_suffix}\n").unwrap();
                 for (_installer, details) in global_installers {
-                    let (InstallerImpl::GithubShell(info) | InstallerImpl::GithubPowershell(info)) =
-                        details;
+                    let (InstallerImpl::Shell(info) | InstallerImpl::Powershell(info)) = details;
 
                     writeln!(&mut gh_body, "### {}\n", info.desc).unwrap();
                     writeln!(&mut gh_body, "```shell\n{}\n```\n", info.hint).unwrap();


Test patch:
diff --git a/cargo-dist/tests/cli-tests.rs b/cargo-dist/tests/cli-tests.rs
index 74071187..8e076735 100644
--- a/cargo-dist/tests/cli-tests.rs
+++ b/cargo-dist/tests/cli-tests.rs
@@ -72,13 +72,9 @@ fn test_manifest() {
     let output = Command::new(BIN)
         .arg("dist")
         .arg("manifest")
+        .arg("--artifacts=all")
         .arg("--no-local-paths")
         .arg("--output-format=json")
-        .arg("--target=x86_64-pc-windows-msvc")
-        .arg("--target=x86_64-apple-darwin")
-        .arg("--target=x86_64-unknown-linux-gnu")
-        .arg("--installer=github-shell")
-        .arg("--installer=github-powershell")
         .stdout(Stdio::piped())
         .stderr(Stdio::piped())
         .output()
diff --git a/cargo-dist/tests/snapshots/cli_tests__long-help.snap b/cargo-dist/tests/snapshots/cli_tests__long-help.snap
index 65584544..767899e6 100644
--- a/cargo-dist/tests/snapshots/cli_tests__long-help.snap
+++ b/cargo-dist/tests/snapshots/cli_tests__long-help.snap
@@ -85,8 +85,10 @@ GLOBAL OPTIONS:
           If left unspecified we will use the values in [workspace.metadata.dist]. `cargo dist init` will persist the values you pass to that location.
 
           Possible values:
-          - github-shell:      Generates a shell script that fetches from github ci
-          - github-powershell: Generates a powershell script that fetches from github ci
+          - shell:
+            Generates a shell script that fetches from your Artifact Download URL (Github Release for now)
+          - powershell:
+            Generates a shell script that fetches from your Artifact Download URL (Github Release for now)
 
       --ci <CI>
           CI we want to support
diff --git a/cargo-dist/tests/snapshots/cli_tests__manifest.snap b/cargo-dist/tests/snapshots/cli_tests__manifest.snap
index e04e1344..f2b44cdc 100644
--- a/cargo-dist/tests/snapshots/cli_tests__manifest.snap
+++ b/cargo-dist/tests/snapshots/cli_tests__manifest.snap
@@ -35,10 +35,10 @@ stdout:
           "description": "Install prebuilt binaries via powershell script"
         },
         {
-          "name": "cargo-dist-v1.0.0-FAKEVERSION-x86_64-pc-windows-msvc.zip",
+          "name": "cargo-dist-v1.0.0-FAKEVERSION-x86_64-apple-darwin.tar.xz",
           "kind": "executable-zip",
           "target_triples": [
-            "x86_64-pc-windows-msvc"
+            "x86_64-apple-darwin"
           ],
           "assets": [
             {
@@ -63,16 +63,16 @@ stdout:
             },
             {
               "name": "cargo-dist",
-              "path": "cargo-dist.exe",
+              "path": "cargo-dist",
               "kind": "executable"
             }
           ]
         },
         {
-          "name": "cargo-dist-v1.0.0-FAKEVERSION-x86_64-apple-darwin.tar.xz",
+          "name": "cargo-dist-v1.0.0-FAKEVERSION-x86_64-pc-windows-msvc.zip",
           "kind": "executable-zip",
           "target_triples": [
-            "x86_64-apple-darwin"
+            "x86_64-pc-windows-msvc"
           ],
           "assets": [
             {
@@ -97,7 +97,7 @@ stdout:
             },
             {
               "name": "cargo-dist",
-              "path": "cargo-dist",
+              "path": "cargo-dist.exe",
               "kind": "executable"
             }
           ]
diff --git a/cargo-dist/tests/snapshots/cli_tests__short-help.snap b/cargo-dist/tests/snapshots/cli_tests__short-help.snap
index 808de6ad..0bb9f3b5 100644
--- a/cargo-dist/tests/snapshots/cli_tests__short-help.snap
+++ b/cargo-dist/tests/snapshots/cli_tests__short-help.snap
@@ -25,7 +25,7 @@ GLOBAL OPTIONS:
       --output-format <OUTPUT_FORMAT>  The format of the output [default: human] [possible values: human, json]
       --no-local-paths                 Strip local paths from output (e.g. in the dist manifest json)
       --target <TARGET>                Target triples we want to build
-      --installer <INSTALLER>          Installers we want to build [possible values: github-shell, github-powershell]
+      --installer <INSTALLER>          Installers we want to build [possible values: shell, powershell]
       --ci <CI>                        CI we want to support [possible values: github]
       --tag <TAG>                      The (git) tag to use for the Announcement that each invocation of cargo-dist is performing