mirror of
https://github.com/actions/setup-python.git
synced 2025-04-24 07:22:14 +00:00
logic update
This commit is contained in:
parent
c628d93a80
commit
cb0e07d80e
2 changed files with 14 additions and 4 deletions
9
dist/setup/index.js
vendored
9
dist/setup/index.js
vendored
|
@ -99609,9 +99609,14 @@ function useCpythonVersion(version, architecture, updateEnvironment, checkLatest
|
||||||
const version = path.basename(path.dirname(installDir));
|
const version = path.basename(path.dirname(installDir));
|
||||||
const major = semver.major(version);
|
const major = semver.major(version);
|
||||||
const minor = semver.minor(version);
|
const minor = semver.minor(version);
|
||||||
if ((major > 3 || (major === 3 && minor >= 10)) && architecture !== 'x64') {
|
if (major > 3 || (major === 3 && minor >= 10)) {
|
||||||
// For Python >= 3.10 and architecture!= 'x64', add the architecture-specific folder to the path
|
// For Python >= 3.10 and architecture!= 'x64', add the architecture-specific folder to the path
|
||||||
const arch = architecture === '32';
|
let arch = '';
|
||||||
|
// Check for x32 or x86 and append the '-32' suffix
|
||||||
|
// Check for x32 or x86 and append the '-32' suffix
|
||||||
|
if (architecture === 'x32' || architecture === 'x86') {
|
||||||
|
arch = `32`; // Always add '-32' for both x32 and x86 architectures
|
||||||
|
}
|
||||||
const userScriptsDir = path.join(process.env['APPDATA'] || '', 'Python', `Python${major}${minor}-${arch}`, // Add architecture-specific folder (e.g., Python310-64 or Python310-32)
|
const userScriptsDir = path.join(process.env['APPDATA'] || '', 'Python', `Python${major}${minor}-${arch}`, // Add architecture-specific folder (e.g., Python310-64 or Python310-32)
|
||||||
'Scripts');
|
'Scripts');
|
||||||
// Add the dynamically constructed path to the environment PATH variable
|
// Add the dynamically constructed path to the environment PATH variable
|
||||||
|
|
|
@ -139,9 +139,14 @@ export async function useCpythonVersion(
|
||||||
const major = semver.major(version);
|
const major = semver.major(version);
|
||||||
const minor = semver.minor(version);
|
const minor = semver.minor(version);
|
||||||
|
|
||||||
if ((major > 3 || (major === 3 && minor >= 10)) && architecture !== 'x64') {
|
if (major > 3 || (major === 3 && minor >= 10)) {
|
||||||
// For Python >= 3.10 and architecture!= 'x64', add the architecture-specific folder to the path
|
// For Python >= 3.10 and architecture!= 'x64', add the architecture-specific folder to the path
|
||||||
const arch = architecture === '32';
|
let arch = '';
|
||||||
|
// Check for x32 or x86 and append the '-32' suffix
|
||||||
|
// Check for x32 or x86 and append the '-32' suffix
|
||||||
|
if (architecture === 'x32' || architecture === 'x86') {
|
||||||
|
arch = `32`; // Always add '-32' for both x32 and x86 architectures
|
||||||
|
}
|
||||||
|
|
||||||
const userScriptsDir = path.join(
|
const userScriptsDir = path.join(
|
||||||
process.env['APPDATA'] || '',
|
process.env['APPDATA'] || '',
|
||||||
|
|
Loading…
Add table
Reference in a new issue