From 6ed331c01c4701a596e3335224b0dc351233505f Mon Sep 17 00:00:00 2001 From: Aria Desires Date: Fri, 1 Aug 2025 16:03:22 -0400 Subject: [PATCH 1/5] support {BRAND}_DOWNLOAD_URL in ps1 installer --- cargo-dist/templates/installer/installer.ps1.j2 | 4 +++- cargo-dist/tests/snapshots/akaikatana_basic.snap | 4 +++- cargo-dist/tests/snapshots/akaikatana_bins.snap | 4 +++- .../akaikatana_one_alias_among_many_binaries.snap | 4 +++- .../tests/snapshots/akaikatana_two_bin_aliases.snap | 4 +++- cargo-dist/tests/snapshots/akaikatana_updaters.snap | 4 +++- cargo-dist/tests/snapshots/axolotlsay_abyss.snap | 4 +++- cargo-dist/tests/snapshots/axolotlsay_action_commit.snap | 4 +++- cargo-dist/tests/snapshots/axolotlsay_alias.snap | 4 +++- .../snapshots/axolotlsay_alias_ignores_missing_bins.snap | 4 +++- cargo-dist/tests/snapshots/axolotlsay_basic.snap | 4 +++- cargo-dist/tests/snapshots/axolotlsay_basic_bins.snap | 4 +++- cargo-dist/tests/snapshots/axolotlsay_basic_lies.snap | 4 +++- .../tests/snapshots/axolotlsay_build_setup_steps.snap | 4 +++- cargo-dist/tests/snapshots/axolotlsay_cross1.snap | 4 +++- cargo-dist/tests/snapshots/axolotlsay_cross2.snap | 4 +++- .../snapshots/axolotlsay_disable_source_tarball.snap | 4 +++- .../tests/snapshots/axolotlsay_dist_url_override.snap | 4 +++- cargo-dist/tests/snapshots/axolotlsay_edit_existing.snap | 4 +++- .../snapshots/axolotlsay_generic_workspace_basic.snap | 8 ++++++-- .../tests/snapshots/axolotlsay_homebrew_packages.snap | 4 +++- .../tests/snapshots/axolotlsay_no_homebrew_publish.snap | 4 +++- .../tests/snapshots/axolotlsay_several_aliases.snap | 4 +++- .../snapshots/axolotlsay_ssldotcom_windows_sign.snap | 4 +++- .../snapshots/axolotlsay_ssldotcom_windows_sign_prod.snap | 4 +++- cargo-dist/tests/snapshots/axolotlsay_updaters.snap | 4 +++- .../tests/snapshots/axolotlsay_user_global_build_job.snap | 4 +++- cargo-dist/tests/snapshots/axolotlsay_user_host_job.snap | 4 +++- .../tests/snapshots/axolotlsay_user_local_build_job.snap | 4 +++- cargo-dist/tests/snapshots/axolotlsay_user_plan_job.snap | 4 +++- .../tests/snapshots/axolotlsay_user_publish_job.snap | 4 +++- cargo-dist/tests/snapshots/install_path_cargo_home.snap | 4 +++- .../tests/snapshots/install_path_env_no_subdir.snap | 4 +++- cargo-dist/tests/snapshots/install_path_env_subdir.snap | 4 +++- .../tests/snapshots/install_path_env_subdir_space.snap | 4 +++- .../snapshots/install_path_env_subdir_space_deeper.snap | 4 +++- .../snapshots/install_path_fallback_no_env_var_set.snap | 4 +++- .../tests/snapshots/install_path_home_subdir_deeper.snap | 4 +++- .../tests/snapshots/install_path_home_subdir_min.snap | 4 +++- .../tests/snapshots/install_path_home_subdir_space.snap | 4 +++- .../snapshots/install_path_home_subdir_space_deeper.snap | 4 +++- .../tests/snapshots/install_path_no_fallback_taken.snap | 4 +++- 42 files changed, 129 insertions(+), 43 deletions(-) diff --git a/cargo-dist/templates/installer/installer.ps1.j2 b/cargo-dist/templates/installer/installer.ps1.j2 index 36fe7bf26..48997644a 100644 --- a/cargo-dist/templates/installer/installer.ps1.j2 +++ b/cargo-dist/templates/installer/installer.ps1.j2 @@ -56,7 +56,9 @@ if ($env:{{ env_vars.ghe_base_url_env_var }}) { } else { $installer_base_url = "{{ hosting.github.artifact_base_url }}" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:{{ env_vars.download_url_env_var }}) { + $ArtifactDownloadUrl = $env:{{ env_vars.download_url_env_var }} +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url{{ hosting.github.artifact_download_path }}" diff --git a/cargo-dist/tests/snapshots/akaikatana_basic.snap b/cargo-dist/tests/snapshots/akaikatana_basic.snap index 2adb16ab1..7b23475d8 100644 --- a/cargo-dist/tests/snapshots/akaikatana_basic.snap +++ b/cargo-dist/tests/snapshots/akaikatana_basic.snap @@ -1619,7 +1619,9 @@ if ($env:AKAIKATANA_REPACK_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AKAIKATANA_REPACK_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AKAIKATANA_REPACK_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/mistydemeo/akaikatana-repack/releases/download/v0.2.0" diff --git a/cargo-dist/tests/snapshots/akaikatana_bins.snap b/cargo-dist/tests/snapshots/akaikatana_bins.snap index 9a91f7571..0baea4341 100644 --- a/cargo-dist/tests/snapshots/akaikatana_bins.snap +++ b/cargo-dist/tests/snapshots/akaikatana_bins.snap @@ -1619,7 +1619,9 @@ if ($env:AKAIKATANA_REPACK_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AKAIKATANA_REPACK_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AKAIKATANA_REPACK_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/mistydemeo/akaikatana-repack/releases/download/v0.2.0" 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 d234f8da0..2f3110038 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 @@ -1647,7 +1647,9 @@ if ($env:AKAIKATANA_REPACK_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AKAIKATANA_REPACK_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AKAIKATANA_REPACK_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/mistydemeo/akaikatana-repack/releases/download/v0.2.0" diff --git a/cargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snap b/cargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snap index 0bc406d8c..274fe2ab5 100644 --- a/cargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snap +++ b/cargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snap @@ -1671,7 +1671,9 @@ if ($env:AKAIKATANA_REPACK_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AKAIKATANA_REPACK_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AKAIKATANA_REPACK_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/mistydemeo/akaikatana-repack/releases/download/v0.2.0" diff --git a/cargo-dist/tests/snapshots/akaikatana_updaters.snap b/cargo-dist/tests/snapshots/akaikatana_updaters.snap index 8b158e7f3..a7f9cf466 100644 --- a/cargo-dist/tests/snapshots/akaikatana_updaters.snap +++ b/cargo-dist/tests/snapshots/akaikatana_updaters.snap @@ -1619,7 +1619,9 @@ if ($env:AKAIKATANA_REPACK_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AKAIKATANA_REPACK_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AKAIKATANA_REPACK_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/mistydemeo/akaikatana-repack/releases/download/v0.2.0" diff --git a/cargo-dist/tests/snapshots/axolotlsay_abyss.snap b/cargo-dist/tests/snapshots/axolotlsay_abyss.snap index b88f0c5c1..055fcf89f 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_abyss.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_abyss.snap @@ -1619,7 +1619,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" diff --git a/cargo-dist/tests/snapshots/axolotlsay_action_commit.snap b/cargo-dist/tests/snapshots/axolotlsay_action_commit.snap index d0afbed75..5f1a22505 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_action_commit.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_action_commit.snap @@ -1687,7 +1687,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" diff --git a/cargo-dist/tests/snapshots/axolotlsay_alias.snap b/cargo-dist/tests/snapshots/axolotlsay_alias.snap index f559f812e..ab8c79859 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_alias.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_alias.snap @@ -1647,7 +1647,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" 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 66d31d291..693d90b3d 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_alias_ignores_missing_bins.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_alias_ignores_missing_bins.snap @@ -1651,7 +1651,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" diff --git a/cargo-dist/tests/snapshots/axolotlsay_basic.snap b/cargo-dist/tests/snapshots/axolotlsay_basic.snap index 9afee577f..8ee74b3d9 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_basic.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_basic.snap @@ -1687,7 +1687,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" diff --git a/cargo-dist/tests/snapshots/axolotlsay_basic_bins.snap b/cargo-dist/tests/snapshots/axolotlsay_basic_bins.snap index 2e4fbbd34..64ce57cba 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_basic_bins.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_basic_bins.snap @@ -1687,7 +1687,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" diff --git a/cargo-dist/tests/snapshots/axolotlsay_basic_lies.snap b/cargo-dist/tests/snapshots/axolotlsay_basic_lies.snap index e43a538f5..9641ab951 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_basic_lies.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_basic_lies.snap @@ -1622,7 +1622,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" diff --git a/cargo-dist/tests/snapshots/axolotlsay_build_setup_steps.snap b/cargo-dist/tests/snapshots/axolotlsay_build_setup_steps.snap index 36fabbc3e..065f54cc9 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_build_setup_steps.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_build_setup_steps.snap @@ -1619,7 +1619,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" diff --git a/cargo-dist/tests/snapshots/axolotlsay_cross1.snap b/cargo-dist/tests/snapshots/axolotlsay_cross1.snap index 43787edf4..387977ca8 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_cross1.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_cross1.snap @@ -1620,7 +1620,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" diff --git a/cargo-dist/tests/snapshots/axolotlsay_cross2.snap b/cargo-dist/tests/snapshots/axolotlsay_cross2.snap index 4571de4de..b37a1c692 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_cross2.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_cross2.snap @@ -1484,7 +1484,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" diff --git a/cargo-dist/tests/snapshots/axolotlsay_disable_source_tarball.snap b/cargo-dist/tests/snapshots/axolotlsay_disable_source_tarball.snap index 3368bac6a..ad74fabb7 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_disable_source_tarball.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_disable_source_tarball.snap @@ -1619,7 +1619,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" diff --git a/cargo-dist/tests/snapshots/axolotlsay_dist_url_override.snap b/cargo-dist/tests/snapshots/axolotlsay_dist_url_override.snap index a961b50d1..0dd8695d9 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_dist_url_override.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_dist_url_override.snap @@ -1554,7 +1554,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" diff --git a/cargo-dist/tests/snapshots/axolotlsay_edit_existing.snap b/cargo-dist/tests/snapshots/axolotlsay_edit_existing.snap index 12a969eb9..6b161aa62 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_edit_existing.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_edit_existing.snap @@ -1619,7 +1619,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" diff --git a/cargo-dist/tests/snapshots/axolotlsay_generic_workspace_basic.snap b/cargo-dist/tests/snapshots/axolotlsay_generic_workspace_basic.snap index d3358873c..1f8a80971 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_generic_workspace_basic.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_generic_workspace_basic.snap @@ -1618,7 +1618,9 @@ if ($env:AXOLOTLSAY_JS_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_JS_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_JS_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay-hybrid/releases/download/v0.10.2" @@ -3744,7 +3746,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay-hybrid/releases/download/v0.10.2" diff --git a/cargo-dist/tests/snapshots/axolotlsay_homebrew_packages.snap b/cargo-dist/tests/snapshots/axolotlsay_homebrew_packages.snap index 6131c7989..db50c0f26 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_homebrew_packages.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_homebrew_packages.snap @@ -1619,7 +1619,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" diff --git a/cargo-dist/tests/snapshots/axolotlsay_no_homebrew_publish.snap b/cargo-dist/tests/snapshots/axolotlsay_no_homebrew_publish.snap index e381c7c74..b2320c4db 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_no_homebrew_publish.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_no_homebrew_publish.snap @@ -1619,7 +1619,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" diff --git a/cargo-dist/tests/snapshots/axolotlsay_several_aliases.snap b/cargo-dist/tests/snapshots/axolotlsay_several_aliases.snap index 9622fdb9e..f29aa4254 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_several_aliases.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_several_aliases.snap @@ -1651,7 +1651,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" diff --git a/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign.snap b/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign.snap index 696f07015..7c90aa3ed 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign.snap @@ -1554,7 +1554,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" 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 696f07015..7c90aa3ed 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign_prod.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign_prod.snap @@ -1554,7 +1554,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" diff --git a/cargo-dist/tests/snapshots/axolotlsay_updaters.snap b/cargo-dist/tests/snapshots/axolotlsay_updaters.snap index 2370d1ac7..da84ee8f6 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_updaters.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_updaters.snap @@ -1619,7 +1619,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" 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 86e1998d5..9f2c16392 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_user_global_build_job.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_user_global_build_job.snap @@ -1619,7 +1619,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" diff --git a/cargo-dist/tests/snapshots/axolotlsay_user_host_job.snap b/cargo-dist/tests/snapshots/axolotlsay_user_host_job.snap index 5a573dcfe..2709ecaf7 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_user_host_job.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_user_host_job.snap @@ -1619,7 +1619,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" 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 7ff2b1de5..736fbef2a 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_user_local_build_job.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_user_local_build_job.snap @@ -1619,7 +1619,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" diff --git a/cargo-dist/tests/snapshots/axolotlsay_user_plan_job.snap b/cargo-dist/tests/snapshots/axolotlsay_user_plan_job.snap index d4d4ccd8a..d9597fcc2 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_user_plan_job.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_user_plan_job.snap @@ -1619,7 +1619,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" diff --git a/cargo-dist/tests/snapshots/axolotlsay_user_publish_job.snap b/cargo-dist/tests/snapshots/axolotlsay_user_publish_job.snap index 4996c0ff5..1f90005de 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_user_publish_job.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_user_publish_job.snap @@ -1619,7 +1619,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" diff --git a/cargo-dist/tests/snapshots/install_path_cargo_home.snap b/cargo-dist/tests/snapshots/install_path_cargo_home.snap index a6c4fa024..6326aaaa4 100644 --- a/cargo-dist/tests/snapshots/install_path_cargo_home.snap +++ b/cargo-dist/tests/snapshots/install_path_cargo_home.snap @@ -1619,7 +1619,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" 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 46ac21b4d..fbe827936 100644 --- a/cargo-dist/tests/snapshots/install_path_env_no_subdir.snap +++ b/cargo-dist/tests/snapshots/install_path_env_no_subdir.snap @@ -1602,7 +1602,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" diff --git a/cargo-dist/tests/snapshots/install_path_env_subdir.snap b/cargo-dist/tests/snapshots/install_path_env_subdir.snap index 66964daf2..2d9dd98cb 100644 --- a/cargo-dist/tests/snapshots/install_path_env_subdir.snap +++ b/cargo-dist/tests/snapshots/install_path_env_subdir.snap @@ -1602,7 +1602,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" 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 72001a1d3..84b4b6eac 100644 --- a/cargo-dist/tests/snapshots/install_path_env_subdir_space.snap +++ b/cargo-dist/tests/snapshots/install_path_env_subdir_space.snap @@ -1602,7 +1602,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" 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 e6bbd70e7..497cf3dbf 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 @@ -1602,7 +1602,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" 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 eedfcd6c1..bd58df67b 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 @@ -1616,7 +1616,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" 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 2a40cd6bc..219451fb3 100644 --- a/cargo-dist/tests/snapshots/install_path_home_subdir_deeper.snap +++ b/cargo-dist/tests/snapshots/install_path_home_subdir_deeper.snap @@ -1602,7 +1602,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" 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 cf183a060..52da0e0eb 100644 --- a/cargo-dist/tests/snapshots/install_path_home_subdir_min.snap +++ b/cargo-dist/tests/snapshots/install_path_home_subdir_min.snap @@ -1602,7 +1602,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" 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 538942e11..0b34676e4 100644 --- a/cargo-dist/tests/snapshots/install_path_home_subdir_space.snap +++ b/cargo-dist/tests/snapshots/install_path_home_subdir_space.snap @@ -1602,7 +1602,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" 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 70171a635..31a39e662 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 @@ -1602,7 +1602,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" 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 acda96daf..64b14b278 100644 --- a/cargo-dist/tests/snapshots/install_path_no_fallback_taken.snap +++ b/cargo-dist/tests/snapshots/install_path_no_fallback_taken.snap @@ -1616,7 +1616,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" From 75b94c0af2f32208e21c2fe0464ed84d46948f54 Mon Sep 17 00:00:00 2001 From: Aria Desires Date: Fri, 1 Aug 2025 16:08:28 -0400 Subject: [PATCH 2/5] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 655ff5111..b2b403a3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Unreleased * Fixed bug in recursive-tarball setting (now handles non-ascii paths correctly) +* All supported `INSTALLER_*` env vars now have a preferred equivalent `{APP_NAME}_*` env var for shell and powershell installers. # Version 0.28.6 (2025-06-09) From ecae30ca454c801aa4fbc536cd233b76e015c572 Mon Sep 17 00:00:00 2001 From: Aria Desires Date: Fri, 1 Aug 2025 16:09:24 -0400 Subject: [PATCH 3/5] release: 0.28.7-prerelease.3 --- Cargo.lock | 6 +++--- Cargo.toml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 756c3b0a1..9b145f19a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -178,7 +178,7 @@ dependencies = [ [[package]] name = "axoproject" -version = "0.28.7-prerelease.2" +version = "0.28.7-prerelease.3" dependencies = [ "axoasset", "axoprocess", @@ -374,7 +374,7 @@ dependencies = [ [[package]] name = "cargo-dist" -version = "0.28.7-prerelease.2" +version = "0.28.7-prerelease.3" dependencies = [ "axoasset", "axocli", @@ -425,7 +425,7 @@ dependencies = [ [[package]] name = "cargo-dist-schema" -version = "0.28.7-prerelease.2" +version = "0.28.7-prerelease.3" dependencies = [ "camino", "gazenot", diff --git a/Cargo.toml b/Cargo.toml index debae3fbb..fd3c57b9f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,13 +12,13 @@ edition = "2021" license = "MIT OR Apache-2.0" repository = "https://github.com/astral-sh/cargo-dist" homepage = "https://github.com/astral-sh/cargo-dist" -version = "0.28.7-prerelease.2" +version = "0.28.7-prerelease.3" rust-version = "1.74" [workspace.dependencies] # intra-workspace deps (you need to bump these versions when you cut releases too! -cargo-dist-schema = { version = "=0.28.7-prerelease.2", path = "cargo-dist-schema" } -axoproject = { version = "=0.28.7-prerelease.2", path = "axoproject", default-features = false, features = ["cargo-projects", "generic-projects", "npm-projects"] } +cargo-dist-schema = { version = "=0.28.7-prerelease.3", path = "cargo-dist-schema" } +axoproject = { version = "=0.28.7-prerelease.3", path = "axoproject", default-features = false, features = ["cargo-projects", "generic-projects", "npm-projects"] } # first-party deps axocli = { version = "0.2.0" } From 303f7d04eba5947611d0a6470642df229a18da5a Mon Sep 17 00:00:00 2001 From: Aria Desires Date: Fri, 1 Aug 2025 16:32:18 -0400 Subject: [PATCH 4/5] update bootstrap dist --- .github/workflows/release.yml | 2 +- dist-workspace.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2a307e325..403dd3903 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/astral-sh/cargo-dist/releases/download/v0.28.6-prerelease.1/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/cargo-dist/releases/download/v0.28.7-prerelease.3/cargo-dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 with: diff --git a/dist-workspace.toml b/dist-workspace.toml index 23c2df39d..ecccba157 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.28.6-prerelease.1" +cargo-dist-version = "0.28.7-prerelease.3" # CI backends to support ci = "github" # The installers to generate for each app From 73d49059acdecfd367c504135724d69ce8006593 Mon Sep 17 00:00:00 2001 From: Aria Desires Date: Fri, 1 Aug 2025 16:32:31 -0400 Subject: [PATCH 5/5] release: 0.28.7 --- CHANGELOG.md | 5 +++++ Cargo.lock | 6 +++--- Cargo.toml | 6 +++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2b403a3d..941d27337 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Unreleased +Nothing Yet! + + +# Version 0.28.7 (2025-08-01) + * Fixed bug in recursive-tarball setting (now handles non-ascii paths correctly) * All supported `INSTALLER_*` env vars now have a preferred equivalent `{APP_NAME}_*` env var for shell and powershell installers. diff --git a/Cargo.lock b/Cargo.lock index 9b145f19a..81d9de925 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -178,7 +178,7 @@ dependencies = [ [[package]] name = "axoproject" -version = "0.28.7-prerelease.3" +version = "0.28.7" dependencies = [ "axoasset", "axoprocess", @@ -374,7 +374,7 @@ dependencies = [ [[package]] name = "cargo-dist" -version = "0.28.7-prerelease.3" +version = "0.28.7" dependencies = [ "axoasset", "axocli", @@ -425,7 +425,7 @@ dependencies = [ [[package]] name = "cargo-dist-schema" -version = "0.28.7-prerelease.3" +version = "0.28.7" dependencies = [ "camino", "gazenot", diff --git a/Cargo.toml b/Cargo.toml index fd3c57b9f..f1f60f23e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,13 +12,13 @@ edition = "2021" license = "MIT OR Apache-2.0" repository = "https://github.com/astral-sh/cargo-dist" homepage = "https://github.com/astral-sh/cargo-dist" -version = "0.28.7-prerelease.3" +version = "0.28.7" rust-version = "1.74" [workspace.dependencies] # intra-workspace deps (you need to bump these versions when you cut releases too! -cargo-dist-schema = { version = "=0.28.7-prerelease.3", path = "cargo-dist-schema" } -axoproject = { version = "=0.28.7-prerelease.3", path = "axoproject", default-features = false, features = ["cargo-projects", "generic-projects", "npm-projects"] } +cargo-dist-schema = { version = "=0.28.7", path = "cargo-dist-schema" } +axoproject = { version = "=0.28.7", path = "axoproject", default-features = false, features = ["cargo-projects", "generic-projects", "npm-projects"] } # first-party deps axocli = { version = "0.2.0" }