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

20
src/install-pypy.ts
View file

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