actions/setup-python
1
0
Fork 0
mirror of https://github.com/actions/setup-python.git synced 2025-04-24 07:22:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Debug

Browse source
This commit is contained in:
Vladimir Safonkin 2022-10-13 18:07:52 +02:00
parent 5041c3b04f
commit 82e58e0e69
2 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dist/setup/index.js vendored
View file

@ -66565,10 +66565,7 @@ function pypyVersionToSemantic(versionSpec) {
} }
exports.pypyVersionToSemantic = pypyVersionToSemantic; exports.pypyVersionToSemantic = pypyVersionToSemantic;
function isArchPresentForWindows(item, architecture) { function isArchPresentForWindows(item, architecture) {
// convert x32 to x86 cause os.arch() return x32 for 32-bit system but PyPy releases json has x86 arch value. architecture = ReplaceX32toX86(architecture);
if (architecture === 'x32') {
architecture = 'x86';
}
return item.files.some((file) => { return item.files.some((file) => {
return file.arch === architecture && utils_1.WINDOWS_PLATFORMS.includes(file.platform); return file.arch === architecture && utils_1.WINDOWS_PLATFORMS.includes(file.platform);
}); });
@ -66579,9 +66576,7 @@ function isArchPresentForMacOrLinux(item, architecture, platform) {
} }
exports.isArchPresentForMacOrLinux = isArchPresentForMacOrLinux; exports.isArchPresentForMacOrLinux = isArchPresentForMacOrLinux;
function findAssetForWindows(releases, architecture) { function findAssetForWindows(releases, architecture) {
if (architecture === 'x32') { architecture = ReplaceX32toX86(architecture);
architecture = 'x86';
}
return releases.files.find((item) => { return releases.files.find((item) => {
return item.arch === architecture && utils_1.WINDOWS_PLATFORMS.includes(item.platform); return item.arch === architecture && utils_1.WINDOWS_PLATFORMS.includes(item.platform);
}); });
@ -66591,6 +66586,13 @@ function findAssetForMacOrLinux(releases, architecture, platform) {
return releases.files.find((item) => item.arch === architecture && item.platform === platform); return releases.files.find((item) => item.arch === architecture && item.platform === platform);
} }
exports.findAssetForMacOrLinux = findAssetForMacOrLinux; exports.findAssetForMacOrLinux = findAssetForMacOrLinux;
function ReplaceX32toX86(architecture) {
// convert x32 to x86 because os.arch() return x32 for 32-bit systems but PyPy releases json has x86 arch value.
if (architecture === 'x32') {
architecture = 'x86';
}
return architecture;
}
/***/ }), /***/ }),

17
src/install-pypy.ts
View file

@ -206,10 +206,7 @@ export function pypyVersionToSemantic(versionSpec: string) {
} }
export function isArchPresentForWindows(item: any, architecture: 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. architecture = ReplaceX32toX86(architecture);
if (architecture === 'x32') {
architecture = 'x86';
}
return item.files.some( return item.files.some(
(file: any) => { (file: any) => {
return file.arch === architecture && WINDOWS_PLATFORMS.includes(file.platform); return file.arch === architecture && WINDOWS_PLATFORMS.includes(file.platform);
@ -228,9 +225,7 @@ export function isArchPresentForMacOrLinux(
} }
export function findAssetForWindows(releases: any, architecture: string) { export function findAssetForWindows(releases: any, architecture: string) {
if (architecture === 'x32') { architecture = ReplaceX32toX86(architecture);
architecture = 'x86';
}
return releases.files.find( return releases.files.find(
(item: any) => { (item: any) => {
return item.arch === architecture && WINDOWS_PLATFORMS.includes(item.platform); return item.arch === architecture && WINDOWS_PLATFORMS.includes(item.platform);
@ -247,3 +242,11 @@ export function findAssetForMacOrLinux(
(item: any) => item.arch === architecture && item.platform === platform (item: any) => item.arch === architecture && item.platform === platform
); );
} }
function ReplaceX32toX86(architecture: string): string {
// convert x32 to x86 because os.arch() return x32 for 32-bit systems but PyPy releases json has x86 arch value.
if (architecture === 'x32') {
architecture = 'x86';
}
return architecture;
}