Fix downloads for @yarnpkg/cli-dist #647
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The changes to make this download script work for both `npm` and `yarn` distributions [#612](#612) has a bug where the requested distribution (`yarn`) differs from its package name if the version is `>=2` (`@yarnpkg/cli-dist`) and that wasn't accounted for in the name of the download file. The `curl` command that downloads the tarball should have been saving to `yarn-v{x.y.z}.tar.gz` but was instead saving to `@yarnpkg/cli-dist-v{x.y.z}.tar.gz`. This is causing automation failures (e.g.; https://github.com/heroku/buildpacks-nodejs/actions/runs/6179740345/job/16775160336) This PR keeps the `distribution_name` and `package_name` separate so this mismatch will no longer happen. It also: - adds some extra logging which would have made the error more obvious - DRYS up the `npm_url`, ``tarball_url`, and `download_file` which previously were being inlined into commands - adds retries and timeouts to `curl`
Malax
approved these changes
Sep 18, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The changes to make this download script work for both
npmandyarndistributions #612 has a bug where the requested distribution (yarn) differs from its package name if the version is>=2(@yarnpkg/cli-dist) and that wasn't accounted for in the name of the download file.The
curlcommand that downloads the tarball should have been saving toyarn-v{x.y.z}.tar.gzbut was instead saving to@yarnpkg/cli-dist-v{x.y.z}.tar.gz. This is causing automation failures (e.g.; https://github.com/heroku/buildpacks-nodejs/actions/runs/6179740345/job/16775160336)This PR keeps the
distribution_nameandpackage_nameseparate so this mismatch will no longer happen.It also:
npm_url,tarball_url, anddownloaded_tarballwhich previously were being inlined into commandscurl