Merge pull request #97 from aminya/python [skip ci]

Author: aminya

dist/actions_python.239cf807.js

@@ -49,7 +49,7 @@
     "msvc-dev-cmd": "github:aminya/msvc-dev-cmd#9f672c1",
     "numerous": "1.0.3",
     "semver": "7.3.7",
-    "setup-python": "github:actions/setup-python#ffcd00020c213885323d35524aa155f17870b8dd",
+    "setup-python": "github:actions/setup-python#f0bcf8be037eba11327da6eaf40cd99a2a092494",
     "time-delta": "github:aminya/time-delta#69d91a41cef28e569be9a2991129f5f7d1f0d00e",
     "ubuntu-version": "^2.0.0",
     "untildify": "^4.0.0",

dist/actions_python.239cf807.js.map

@@ -5,56 +5,71 @@ import { info, warning } from "../utils/io/io"
 import { debug } from "@actions/core"
 import path from "path"
 import { isGitHubCI } from "../utils/env/isci"
-import { cacheDependencies } from "./actions_cache"
+import { isCacheFeatureAvailable, IS_LINUX, IS_WINDOWS } from "setup-python/src/utils"
+import { getCacheDistributor } from "setup-python/src/cache-distributions/cache-factory"
 
 function isPyPyVersion(versionSpec: string) {
   return versionSpec.startsWith("pypy")
 }
 
-// function resolveVersionInput(version: string): string {
-//   let versionFile = getInput("python-version-file")
+/*
+function resolveVersionInput(version: string): string {
+  let versionFile = getInput("python-version-file")
 
-//   if (version && versionFile) {
-//     warning("Both python-version and python-version-file inputs are specified, only python-version will be used")
-//   }
+  if (version && versionFile) {
+    warning("Both python-version and python-version-file inputs are specified, only python-version will be used")
+  }
 
-//   if (version) {
-//     return version
-//   }
+  if (version) {
+    return version
+  }
 
-//   versionFile = versionFile || ".python-version"
-//   if (!existsSync(versionFile)) {
-//     throw new Error(`The specified python version file at: ${versionFile} does not exist`)
-//   }
-//   version = readFileSync(versionFile, "utf8")
-//   info(`Resolved ${versionFile} as ${version}`)
+  versionFile = versionFile || ".python-version"
+  if (!existsSync(versionFile)) {
+    throw new Error(`The specified python version file at: ${versionFile} does not exist`)
+  }
+  version = readFileSync(versionFile, "utf8")
+  info(`Resolved ${versionFile} as ${version}`)
 
-//   return version
-// }
+  return version
+}
+*/
+
+export async function cacheDependencies(cache: string, pythonVersion: string) {
+  const cacheDependencyPath = undefined // core.getInput("cache-dependency-path") || undefined
+  const cacheDistributor = getCacheDistributor(cache, pythonVersion, cacheDependencyPath)
+  await cacheDistributor.restoreCache()
+}
 
 export async function setupActionsPython(version: string, _setupDir: string, arch: string) {
-  if (process.env.AGENT_TOOLSDIRECTORY?.trim()) {
-    debug(`Python is expected to be installed into AGENT_TOOLSDIRECTORY=${process.env.AGENT_TOOLSDIRECTORY}`)
+  // According to the README windows binaries do not require to be installed
+  // in the specific location, but Mac and Linux do
+  if (!IS_WINDOWS && !process.env.AGENT_TOOLSDIRECTORY?.trim()) {
+    if (IS_LINUX) {
+      process.env.AGENT_TOOLSDIRECTORY = "/opt/hostedtoolcache"
+    } else {
+      process.env.AGENT_TOOLSDIRECTORY = "/Users/runner/hostedtoolcache"
+    }
     process.env.RUNNER_TOOL_CACHE = process.env.AGENT_TOOLSDIRECTORY
-  } else {
-    debug(`Python is expected to be installed into RUNNER_TOOL_CACHE==${process.env.RUNNER_TOOL_CACHE}`)
   }
+  debug(`Python is expected to be installed into RUNNER_TOOL_CACHE=${process.env.RUNNER_TOOL_CACHE}`)
   // const version = resolveVersionInput(versionGiven)
   if (version) {
     let pythonVersion: string
     if (isPyPyVersion(version)) {
-      const installed = await findPyPyVersion(version, arch)
+      const installed = await findPyPyVersion(version, arch, true)
       pythonVersion = `${installed.resolvedPyPyVersion}-${installed.resolvedPythonVersion}`
       info(`Successfully set up PyPy ${installed.resolvedPyPyVersion} with Python (${installed.resolvedPythonVersion})`)
     } else {
-      const installed = await useCpythonVersion(version, arch)
+      const installed = await useCpythonVersion(version, arch, true)
       pythonVersion = installed.version
       info(`Successfully set up ${installed.impl} (${pythonVersion})`)
     }
 
-    const cache = "pip" // core.getInput("cache") // package manager used for caching
-
-    await cacheDependencies(cache, pythonVersion)
+    if (isCacheFeatureAvailable()) {
+      const cache = "pip" // core.getInput("cache") // package manager used for caching
+      await cacheDependencies(cache, pythonVersion)
+    }
   }
 
   if (isGitHubCI()) {