diff --git a/dist/setup/index.js b/dist/setup/index.js index 16fc0c5..e49056d 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -66565,8 +66565,11 @@ function pypyVersionToSemantic(versionSpec) { } exports.pypyVersionToSemantic = pypyVersionToSemantic; function isArchPresentForWindows(item, architecture) { - return item.files.some((file) => file.arch === (architecture === 'x32' ? 'x86' : architecture) && // convert x32 to x86 cause os.arch() return x32 for 32-bit system but PyPy releases json has x86 arch value. - utils_1.WINDOWS_PLATFORMS.includes(file.platform)); + // convert x32 to x86 cause os.arch() return x32 for 32-bit system but PyPy releases json has x86 arch value. + if (architecture === 'x32') { + architecture = 'x86'; + } + return item.files.some((file) => file.arch === architecture && utils_1.WINDOWS_PLATFORMS.includes(file.platform)); } exports.isArchPresentForWindows = isArchPresentForWindows; function isArchPresentForMacOrLinux(item, architecture, platform) { diff --git a/src/install-pypy.ts b/src/install-pypy.ts index cf0ce13..f945e1e 100644 --- a/src/install-pypy.ts +++ b/src/install-pypy.ts @@ -206,10 +206,13 @@ export function pypyVersionToSemantic(versionSpec: string) { } export function isArchPresentForWindows(item: any, architecture: string) { + // convert x32 to x86 cause os.arch() return x32 for 32-bit system but PyPy releases json has x86 arch value. + if (architecture === 'x32') { + architecture = 'x86'; + } return item.files.some( (file: any) => - file.arch === (architecture === 'x32' ? 'x86' : architecture) && // convert x32 to x86 cause os.arch() return x32 for 32-bit system but PyPy releases json has x86 arch value. - WINDOWS_PLATFORMS.includes(file.platform) + file.arch === architecture && WINDOWS_PLATFORMS.includes(file.platform) ); }