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

Debug

Browse source
This commit is contained in:
Vladimir Safonkin 2022-10-13 17:54:26 +02:00
parent c139ac5ef6
commit ffca1d453b
2 changed files with 14 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
dist/setup/index.js vendored
View file

@ -66541,7 +66541,7 @@ function findRelease(releases, pythonVersion, pypyVersion, architecture) {
});
const foundRelease = sortedReleases[0];
const foundAsset = utils_1.IS_WINDOWS
? findAssetForWindows(foundRelease)
? findAssetForWindows(foundRelease, architecture)
: findAssetForMacOrLinux(foundRelease, architecture, process.platform);
return {
foundAsset,
@ -66569,24 +66569,19 @@ function isArchPresentForWindows(item, architecture) {
if (architecture === 'x32') {
architecture = 'x86';
}
core.info(`DEBUG: pypy: ${item.pypy_version}, python: ${item.python_version}, architecture: ${architecture}`);
const result = item.files.some((file) => {
core.info(`arch: ${file.arch}`);
const res = file.arch === architecture && utils_1.WINDOWS_PLATFORMS.includes(file.platform);
core.info(`res: ${res}`);
return res;
return item.files.some((file) => {
return file.arch === architecture && utils_1.WINDOWS_PLATFORMS.includes(file.platform);
});
core.info(`result: ${result}`);
return result;
}
exports.isArchPresentForWindows = isArchPresentForWindows;
function isArchPresentForMacOrLinux(item, architecture, platform) {
return item.files.some((file) => file.arch === architecture && file.platform === platform);
}
exports.isArchPresentForMacOrLinux = isArchPresentForMacOrLinux;
function findAssetForWindows(releases) {
return releases.files.find((item) => utils_1.WINDOWS_ARCHS.includes(item.arch) &&
utils_1.WINDOWS_PLATFORMS.includes(item.platform));
function findAssetForWindows(releases, architecture) {
return releases.files.find((item) => {
return item.arch === architecture && utils_1.WINDOWS_PLATFORMS.includes(item.platform);
});
}
exports.findAssetForWindows = findAssetForWindows;
function findAssetForMacOrLinux(releases, architecture, platform) {

20
src/install-pypy.ts
View file

@ -181,7 +181,7 @@ export function findRelease(
const foundRelease = sortedReleases[0];
const foundAsset = IS_WINDOWS
? findAssetForWindows(foundRelease)
? findAssetForWindows(foundRelease, architecture)
: findAssetForMacOrLinux(foundRelease, architecture, process.platform);
return {
@ -210,17 +210,11 @@ export function isArchPresentForWindows(item: any, architecture: string) {
if (architecture === 'x32') {
architecture = 'x86';
}
core.info(`DEBUG: pypy: ${item.pypy_version}, python: ${item.python_version}, architecture: ${architecture}`)
const result = item.files.some(
return item.files.some(
(file: any) => {
core.info(`arch: ${file.arch}`);
const res = file.arch === architecture && WINDOWS_PLATFORMS.includes(file.platform);
core.info(`res: ${res}`);
return res;
return file.arch === architecture && WINDOWS_PLATFORMS.includes(file.platform);
}
);
core.info(`result: ${result}`)
return result
}
export function isArchPresentForMacOrLinux(
@ -233,11 +227,11 @@ export function isArchPresentForMacOrLinux(
);
}
export function findAssetForWindows(releases: any) {
export function findAssetForWindows(releases: any, architecture: string) {
return releases.files.find(
(item: any) =>
WINDOWS_ARCHS.includes(item.arch) &&
WINDOWS_PLATFORMS.includes(item.platform)
(item: any) => {
return item.arch === architecture && WINDOWS_PLATFORMS.includes(item.platform);
}
);
}