diff --git a/.github/workflows/test-python-freethreaded.yml b/.github/workflows/test-python-freethreaded.yml index c769046a..39e69a47 100644 --- a/.github/workflows/test-python-freethreaded.yml +++ b/.github/workflows/test-python-freethreaded.yml @@ -24,7 +24,6 @@ jobs: [ macos-latest, windows-latest, - ubuntu-20.04, ubuntu-22.04, ubuntu-22.04-arm, macos-13, @@ -62,7 +61,6 @@ jobs: [ macos-latest, windows-latest, - ubuntu-20.04, ubuntu-22.04, ubuntu-22.04-arm, macos-13, @@ -103,7 +101,6 @@ jobs: [ macos-latest, windows-latest, - ubuntu-20.04, ubuntu-22.04, ubuntu-22.04-arm, macos-13, @@ -142,7 +139,6 @@ jobs: [ macos-latest, windows-latest, - ubuntu-20.04, ubuntu-22.04, ubuntu-22.04-arm, macos-13, @@ -184,7 +180,6 @@ jobs: [ macos-latest, windows-latest, - ubuntu-20.04, ubuntu-22.04, ubuntu-22.04-arm, macos-13, @@ -226,7 +221,6 @@ jobs: [ macos-latest, windows-latest, - ubuntu-20.04, ubuntu-22.04, ubuntu-22.04-arm, macos-13, @@ -258,7 +252,6 @@ jobs: [ macos-latest, windows-latest, - ubuntu-20.04, ubuntu-22.04, ubuntu-22.04-arm, macos-13, @@ -371,7 +364,6 @@ jobs: [ macos-latest, windows-latest, - ubuntu-20.04, ubuntu-22.04, ubuntu-22.04-arm, macos-13, @@ -461,7 +453,6 @@ jobs: [ macos-latest, windows-latest, - ubuntu-20.04, ubuntu-22.04, ubuntu-22.04-arm, macos-13, diff --git a/dist/setup/index.js b/dist/setup/index.js index 8fb35d22..6253d0b0 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -96896,7 +96896,9 @@ function useCpythonVersion(version, architecture, updateEnvironment, checkLatest } else { // Handle Python < 3.10 - const baseName = `Python${major}${minor}`; + const isFreeThreaded = core.getBooleanInput('freethreaded'); + const suffix = isFreeThreaded ? 't' : ''; + const baseName = `Python${major}${minor}${suffix}`; const pythonPath = path.join(process.env['APPDATA'] || '', 'Python', baseName, 'Scripts'); core.addPath(pythonPath); } diff --git a/src/find-python.ts b/src/find-python.ts index d4adc73e..add4c135 100644 --- a/src/find-python.ts +++ b/src/find-python.ts @@ -175,7 +175,9 @@ export async function useCpythonVersion( core.addPath(pythonPath); } else { // Handle Python < 3.10 - const baseName = `Python${major}${minor}`; + const isFreeThreaded = core.getBooleanInput('freethreaded'); + const suffix = isFreeThreaded ? 't' : ''; + const baseName = `Python${major}${minor}${suffix}`; const pythonPath = path.join( process.env['APPDATA'] || '',