8000 Fix PyPy installation on Windows to adopt new parameters format by AlenaSviridenko · Pull Request #201 · actions/setup-python · GitHub
[go: up one dir, main page]
Skip to content

Fix PyPy installation on Windows to adopt new parameters format #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Apr 12, 2021
Merged

Fix PyPy installation on Windows to adopt new parameters format #201

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cb9573b
test for pypy new version notation
AlenaSviridenko Apr 8, 2021
42c2a27
formatting
AlenaSviridenko Apr 8, 2021
63259a1
uncommented condition
AlenaSviridenko Apr 8, 2021
65839cc
test
AlenaSviridenko Apr 8, 2021
cc3f7d5
added pypy to test matrix
AlenaSviridenko Apr 8, 2021
99e5bb3
test
AlenaSviridenko Apr 8, 2021
32dc6a0
test
AlenaSviridenko Apr 8, 2021
401fc93
restored all tests
AlenaSviridenko Apr 8, 2021
6767fd0
removed logs, added multiarch support for toolcache
AlenaSviridenko Apr 8, 2021
96cc2da
reduced test matrix
AlenaSviridenko Apr 8, 2021
d5b8d9b
removed extra condition about arch
AlenaSviridenko Apr 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test
  • Loading branch information
@AlenaSviridenko
AlenaSviridenko committed Apr 8, 2021
commit 32dc6a05e55fb254be76460018ee873f03d17b0e
13 changes: 12 additions & 1 deletion dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2908,7 +2908,9 @@ function findRelease(releases, pythonVersion, pypyVersion, architecture) {
semver.compare(semver.coerce(current.python_version), semver.coerce(previous.python_version)));
});
const foundRelease = sortedReleases[0];
const foundAsset = foundRelease.files.find(item => item.arch === architecture && item.platform === process.platform);
const foundAsset = utils_1.IS_WINDOWS
? findAssetForWindows(foundRelease)
: findAssetForMacOrLinux(foundRelease, architecture, process.platform);
return {
foundAsset,
resolvedPythonVersion: foundRelease.python_version,
Expand Down Expand Up @@ -2940,6 +2942,15 @@ 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));
}
exports.findAssetForWindows = findAssetForWindows;
function findAssetForMacOrLinux(releases, architecture, platform) {
return releases.files.find((item) => item.arch === architecture && item.platform === platform);
}
exports.findAssetForMacOrLinux = findAssetForMacOrLinux;


/***/ }),
Expand Down
24 changes: 21 additions & 3 deletions src/install-pypy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,9 @@ export function findRelease(
});

const foundRelease = sortedReleases[0];
const foundAsset = foundRelease.files.find(
item => item.arch === architecture && item.platform === process.platform
);
const foundAsset = IS_WINDOWS
? findAssetForWindows(foundRelease)
: findAssetForMacOrLinux(foundRelease, architecture, process.platform);

return {
foundAsset,
Expand Down Expand Up @@ -212,3 +212,21 @@ export function isArchPresentForMacOrLinux(
(file: any) => file.arch === architecture && file.platform === platform
);
}

export function findAssetForWindows(releases: any) {
return releases.files.find(
(item: any) =>
WINDOWS_ARCHS.includes(item.arch) &&
WINDOWS_PLATFORMS.includes(item.platform)
);
}

export function findAssetForMacOrLinux(
releases: any,
architecture: string,
platform: string
) {
return releases.files.find(
(item: any) => item.arch === architecture && item.platform === platform
);
}
0