fix: Make sure registry url ends with a /

Github-Actions-Community · Apr 17, 2024 · ab1f5cf · ab1f5cf
1 parent 4ac06a4
commit ab1f5cf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -25,7 +25,7 @@ export NPM_STRICT_SSL="${INPUT_NPM_STRICT_SSL:-"$NPM_STRICT_SSL"}"
 NPM_STRICT_SSL="${NPM_STRICT_SSL:-"true"}"
 NPM_REGISTRY_SCHEME="https"
 if ! [ "$NPM_STRICT_SSL" = "true" ]; then NPM_REGISTRY_SCHEME="http"; fi
-NPM_REGISTRY_DOMAIN="$(echo "${NPM_REGISTRY_URL:-registry.npmjs.org}" | sed -r 's/https?:\/\///')"
+NPM_REGISTRY_DOMAIN="$(echo "${NPM_REGISTRY_URL:-registry.npmjs.org}" | sed -r 's/https?:\/\///' | sed -r 's/\/+$//')"
 NPM_REGISTRY_URL="${NPM_REGISTRY_SCHEME}://$NPM_REGISTRY_DOMAIN"
 NPM_CONFIG_USERCONFIG="${NPM_CONFIG_USERCONFIG:-"$HOME/.npmrc"}"
 
@@ -40,7 +40,7 @@ if [ -n "$NPM_CUSTOM_NPMRC" ]; then
   echo "$NPM_CUSTOM_NPMRC" > "$NPM_CONFIG_USERCONFIG"
   chmod 0600 "$NPM_CONFIG_USERCONFIG"
 elif [ -n "$NPM_AUTH_TOKEN" ]; then
-  printf "//%s/:_authToken=%s\\nregistry=%s\\nstrict-ssl=%s" "$NPM_REGISTRY_DOMAIN" "$NPM_AUTH_TOKEN" "$NPM_REGISTRY_URL" "$NPM_STRICT_SSL" > "$NPM_CONFIG_USERCONFIG"
+  printf "//%s/:_authToken=%s\\nregistry=%s\\nstrict-ssl=%s" "$NPM_REGISTRY_DOMAIN" "$NPM_AUTH_TOKEN" "${NPM_REGISTRY_URL}/" "$NPM_STRICT_SSL" > "$NPM_CONFIG_USERCONFIG"
   chmod 0600 "$NPM_CONFIG_USERCONFIG"
 fi
 

diff --git a/src/merge-release-run.js b/src/merge-release-run.js
@@ -85,7 +85,10 @@ function isMinorChange(message) {
   return minorTagsRegex.test(firstLine);
 }
 
-const registryUrl = process.env.NPM_REGISTRY_URL || 'https://registry.npmjs.org/';
+let registryUrl = process.env.NPM_REGISTRY_URL || 'https://registry.npmjs.org/';
+if (!registryUrl.endsWith('/')) {
+  registryUrl = `${registryUrl}/`;
+}
 const getFromRegistry = bent('json', registryUrl);
 const event = JSON.parse(fs.readFileSync('/github/workflow/event.json').toString());
 const deployDir = path.join(process.cwd(), process.env.DEPLOY_DIR || '.');