actions/nix-installer-action
1
0
Fork 0
mirror of https://github.com/DeterminateSystems/nix-installer-action.git synced 2024-12-23 13:32:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #44 from colemickens/fixup-nix-url-check

Browse source 
main.ts: fixup logic to ensure only one installer url override is set
This commit is contained in:
Ana Hobden 2023-10-18 10:24:39 -07:00 committed by GitHub
commit df82330768
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main.ts
View file

@ -597,25 +597,30 @@ function resolve_nix_installer_url(
resolved_nix_installer_url = new URL( resolved_nix_installer_url = new URL(
`https://install.determinate.systems/nix/branch/${nix_installer_branch}/nix-installer-${platform}?${url_suffix}`, `https://install.determinate.systems/nix/branch/${nix_installer_branch}/nix-installer-${platform}?${url_suffix}`,
); );
} else if (nix_installer_pr !== null) { }
if (nix_installer_pr !== null) {
num_set += 1; num_set += 1;
resolved_nix_installer_url = new URL( resolved_nix_installer_url = new URL(
`https://install.determinate.systems/nix/pr/${nix_installer_pr}/nix-installer-${platform}?${url_suffix}`, `https://install.determinate.systems/nix/pr/${nix_installer_pr}/nix-installer-${platform}?${url_suffix}`,
); );
} else if (nix_installer_revision !== null) { }
if (nix_installer_revision !== null) {
num_set += 1; num_set += 1;
resolved_nix_installer_url = new URL( resolved_nix_installer_url = new URL(
`https://install.determinate.systems/nix/rev/${nix_installer_revision}/nix-installer-${platform}?${url_suffix}`, `https://install.determinate.systems/nix/rev/${nix_installer_revision}/nix-installer-${platform}?${url_suffix}`,
); );
} else if (nix_installer_tag !== null) { }
if (nix_installer_tag !== null) {
num_set += 1; num_set += 1;
resolved_nix_installer_url = new URL( resolved_nix_installer_url = new URL(
`https://install.determinate.systems/nix/tag/${nix_installer_tag}/nix-installer-${platform}?${url_suffix}`, `https://install.determinate.systems/nix/tag/${nix_installer_tag}/nix-installer-${platform}?${url_suffix}`,
); );
} else if (nix_installer_url !== null) { }
if (nix_installer_url !== null) {
num_set += 1; num_set += 1;
resolved_nix_installer_url = new URL(nix_installer_url); resolved_nix_installer_url = new URL(nix_installer_url);
} else { }
if (resolved_nix_installer_url == null) {
resolved_nix_installer_url = new URL( resolved_nix_installer_url = new URL(
`https://install.determinate.systems/nix/nix-installer-${platform}?${url_suffix}`, `https://install.determinate.systems/nix/nix-installer-${platform}?${url_suffix}`,
); );