@@ -22922,12 +22922,14 @@ async function getLatestVoltaFromVoltaSH() {
2292222922function voltaVersionHasSetup(version) {
2292322923 return semver.gte(version, '0.7.0');
2292422924}
22925- async function buildDownloadUrl(platform, version, variant = '', openSSLVersionForTesting = '') {
22925+ async function buildDownloadUrl(platform, arch, version, variant = '', openSSLVersionForTesting = '') {
2292622926 let fileName = '';
22927+ const isOpenSSLDependent = semver.lt(version, '1.1.0');
2292722928 if (variant) {
2292822929 fileName = `volta-${version}-${variant}.tar.gz`;
2292922930 }
22930- else {
22931+ else if (isOpenSSLDependent) {
22932+ // TODO: remove this branch when support for volta < 1.1.0 is dropped
2293122933 switch (platform) {
2293222934 case 'darwin':
2293322935 fileName = `volta-${version}-macos.tar.gz`;
@@ -22944,6 +22946,22 @@ async function buildDownloadUrl(platform, version, variant = '', openSSLVersionF
2294422946 throw new Error(`your platform ${platform} is not yet supported`);
2294522947 }
2294622948 }
22949+ else {
22950+ switch (platform) {
22951+ case 'darwin':
22952+ fileName = `volta-${version}-macos${arch === 'arm64' ? '-aarch64' : ''}.tar.gz`;
22953+ break;
22954+ case 'linux': {
22955+ fileName = `volta-${version}-linux.tar.gz`;
22956+ break;
22957+ }
22958+ case 'win32':
22959+ fileName = `volta-${version}-windows-x86_64.msi`;
22960+ break;
22961+ default:
22962+ throw new Error(`your platform ${platform} is not yet supported`);
22963+ }
22964+ }
2294722965 return `https://github.com/volta-cli/volta/releases/download/v${version}/${fileName}`;
2294822966}
2294922967async function getOpenSSLVersion(version = '') {
@@ -23022,7 +23040,7 @@ async function acquireVolta(version, options) {
2302223040 // Download - a tool installer intimately knows how to get the tool (and construct urls)
2302323041 //
2302423042 core.info(`downloading volta@${version}`);
23025- const downloadUrl = await buildDownloadUrl(external_os_.platform(), version, options.variant);
23043+ const downloadUrl = await buildDownloadUrl(external_os_.platform(), external_os_.arch(), version, options.variant);
2302623044 core.debug(`downloading from \`${downloadUrl}\``);
2302723045 const downloadPath = await tool_cache.downloadTool(downloadUrl, undefined, options.authToken);
2302823046 const voltaHome = external_path_.join(
0 commit comments