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

Check platform firstly

Browse source
This commit is contained in:
Vladimir Safonkin 2022-10-17 12:48:42 +02:00
parent d1ffee02d7
commit 9854107d3e
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dist/setup/index.js vendored
View file

@ -66614,8 +66614,8 @@ function pypyVersionToSemantic(versionSpec) {
} }
exports.pypyVersionToSemantic = pypyVersionToSemantic; exports.pypyVersionToSemantic = pypyVersionToSemantic;
function isArchPresentForWindows(item, architecture) { function isArchPresentForWindows(item, architecture) {
architecture = ReplaceX32toX86(architecture); architecture = replaceX32toX86(architecture);
return item.files.some((file) => file.arch === architecture && utils_1.WINDOWS_PLATFORMS.includes(file.platform)); return item.files.some((file) => utils_1.WINDOWS_PLATFORMS.includes(file.platform) && file.arch === architecture);
} }
exports.isArchPresentForWindows = isArchPresentForWindows; exports.isArchPresentForWindows = isArchPresentForWindows;
function isArchPresentForMacOrLinux(item, architecture, platform) { function isArchPresentForMacOrLinux(item, architecture, platform) {
@ -66623,15 +66623,15 @@ function isArchPresentForMacOrLinux(item, architecture, platform) {
} }
exports.isArchPresentForMacOrLinux = isArchPresentForMacOrLinux; exports.isArchPresentForMacOrLinux = isArchPresentForMacOrLinux;
function findAssetForWindows(releases, architecture) { function findAssetForWindows(releases, architecture) {
architecture = ReplaceX32toX86(architecture); architecture = replaceX32toX86(architecture);
return releases.files.find((item) => item.arch === architecture && utils_1.WINDOWS_PLATFORMS.includes(item.platform)); return releases.files.find((item) => utils_1.WINDOWS_PLATFORMS.includes(item.platform) && item.arch === architecture);
} }
exports.findAssetForWindows = findAssetForWindows; exports.findAssetForWindows = findAssetForWindows;
function findAssetForMacOrLinux(releases, architecture, platform) { 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) { function replaceX32toX86(architecture) {
// convert x32 to x86 because os.arch() returns x32 for 32-bit systems but PyPy releases json has x86 arch value. // convert x32 to x86 because os.arch() returns x32 for 32-bit systems but PyPy releases json has x86 arch value.
if (architecture === 'x32') { if (architecture === 'x32') {
architecture = 'x86'; architecture = 'x86';

10
src/install-pypy.ts
View file

@ -205,10 +205,10 @@ export function pypyVersionToSemantic(versionSpec: string) {
} }
export function isArchPresentForWindows(item: any, architecture: string) { export function isArchPresentForWindows(item: any, architecture: string) {
architecture = ReplaceX32toX86(architecture); architecture = replaceX32toX86(architecture);
return item.files.some( return item.files.some(
(file: any) => (file: any) =>
file.arch === architecture && WINDOWS_PLATFORMS.includes(file.platform) WINDOWS_PLATFORMS.includes(file.platform) && file.arch === architecture
); );
} }
@ -223,10 +223,10 @@ export function isArchPresentForMacOrLinux(
} }
export function findAssetForWindows(releases: any, architecture: string) { export function findAssetForWindows(releases: any, architecture: string) {
architecture = ReplaceX32toX86(architecture); architecture = replaceX32toX86(architecture);
return releases.files.find( return releases.files.find(
(item: any) => (item: any) =>
item.arch === architecture && WINDOWS_PLATFORMS.includes(item.platform) WINDOWS_PLATFORMS.includes(item.platform) && item.arch === architecture
); );
} }
@ -240,7 +240,7 @@ export function findAssetForMacOrLinux(
); );
} }
function ReplaceX32toX86(architecture: string): string { function replaceX32toX86(architecture: string): string {
// convert x32 to x86 because os.arch() returns x32 for 32-bit systems but PyPy releases json has x86 arch value. // convert x32 to x86 because os.arch() returns x32 for 32-bit systems but PyPy releases json has x86 arch value.
if (architecture === 'x32') { if (architecture === 'x32') {
architecture = 'x86'; architecture = 'x86';