do not use unsupported RYE_TOOLCHAIN_VERSION (#339)

eifinger · Sep 17, 2024 · 9a8a6ba · 9a8a6ba
1 parent 74af863
commit 9a8a6ba
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 9 deletions.
diff --git a/dist/setup/index.js b/dist/setup/index.js
diff --git a/dist/setup/index.js.map b/dist/setup/index.js.map
diff --git a/src/setup-rye.ts b/src/setup-rye.ts
@@ -128,14 +128,25 @@ async function installRye(
 }
 
 async function determineToolchainVersion(): Promise<string | void> {
+ const supportedMinorVersions = ['9', '10', '11', '12']
  const pythonVersionFile = `${WORKING_DIR_PATH}${path.sep}.python-version`
  if (fs.existsSync(pythonVersionFile)) {
- const toolchainVersion = await fs.promises.readFile(
- pythonVersionFile,
- 'utf8'
+ const fileContent = await fs.promises.readFile(pythonVersionFile, 'utf8')
+ const toolchainVersion = fileContent.trim()
+ if (
+ toolchainVersion.startsWith('cpython@3') ||
+ toolchainVersion.startsWith('3')
+ ) {
+ const minorVersion = toolchainVersion.split('.')[1]
+ if (supportedMinorVersions.includes(minorVersion)) {
+ core.info(`Determined RYE_TOOLCHAIN_VERSION: ${toolchainVersion}`)
+ return toolchainVersion
+ }
+ }
+ core.warning(
+ `Unsupported version in .python-version: ${toolchainVersion}, using default RYE_TOOLCHAIN_VERSION`
  )
- core.info(`Determined RYE_TOOLCHAIN_VERSION: ${toolchainVersion.trim()}`)
- return toolchainVersion.trim()
+ return
  }
  core.warning(
  `No .python-version file found, using default RYE_TOOLCHAIN_VERSION`