fix: update setup-python

2022-06-25 17:16:32 -07:00 · 2022-06-25 17:16:32 -07:00 · 5692a92fdb
parent ba381879e0
commit 5692a92fdb
9 changed files with 70 additions and 48 deletions
--- a/dist/actions_python.678f52ec.js
+++ b/dist/actions_python.678f52ec.js
--- a/dist/actions_python.678f52ec.js.map
+++ b/dist/actions_python.678f52ec.js.map
--- a/dist/actions_python.f691d232.js
+++ b/dist/actions_python.f691d232.js
--- a/dist/actions_python.f691d232.js.map
+++ b/dist/actions_python.f691d232.js.map
--- a/dist/setup_cpp.js
+++ b/dist/setup_cpp.js
--- a/dist/setup_cpp.js.map
+++ b/dist/setup_cpp.js.map
--- a/package.json
+++ b/package.json
@ -43,7 +43,7 @@
    "msvc-dev-cmd": "github:aminya/msvc-dev-cmd#9f672c1",
    "numerous": "1.0.3",
    "semver": "7.3.7",
-    "setup-python": "github:actions/setup-python#v4.0.0",
+    "setup-python": "github:actions/setup-python#ffcd00020c213885323d35524aa155f17870b8dd",
    "time-delta": "github:aminya/time-delta#69d91a41cef28e569be9a2991129f5f7d1f0d00e",
    "ubuntu-version": "^2.0.0",
    "untildify": "^4.0.0",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -1,4 +1,4 @@
-lockfileVersion: 5.4
+lockfileVersion: 5.3

 overrides:
  semver: 7.3.7
@ -38,7 +38,7 @@ specifiers:
  prettier: 2.7.1
  prettier-config-atomic: ^3.0.9
  semver: 7.3.7
-  setup-python: github:actions/setup-python#v4.0.0
+  setup-python: github:actions/setup-python#ffcd00020c213885323d35524aa155f17870b8dd
  shx: 0.3.4
  terser-config-atomic: ^0.1.1
  time-delta: github:aminya/time-delta#69d91a41cef28e569be9a2991129f5f7d1f0d00e
@ -59,7 +59,7 @@ dependencies:
  msvc-dev-cmd: github.com/aminya/msvc-dev-cmd/9f672c1
  numerous: 1.0.3
  semver: 7.3.7
-  setup-python: github.com/actions/setup-python/d09bd5e6005b175076f227b13d9730d56e9dcfcb
+  setup-python: github.com/actions/setup-python/ffcd00020c213885323d35524aa155f17870b8dd
  time-delta: github.com/aminya/time-delta/69d91a41cef28e569be9a2991129f5f7d1f0d00e
  ubuntu-version: 2.0.0
  untildify: 4.0.0
@ -87,7 +87,7 @@ devDependencies:
  prettier-config-atomic: 3.0.9
  shx: 0.3.4
  terser-config-atomic: 0.1.1
-  ts-jest: 28.0.5_zv2ltmnvcc5apkdaecods742je
+  ts-jest: 28.0.5_jest@28.1.1+typescript@4.7.4
  typescript: 4.7.4

 packages:
@ -321,7 +321,7 @@ packages:
      - supports-color
    dev: true

-  /@babel/eslint-parser/7.18.2_cz6e4qppzra6gosrrzcvbsxiom:
+  /@babel/eslint-parser/7.18.2_@babel+core@7.18.5+eslint@8.18.0:
    resolution: {integrity: sha512-oFQYkE8SuH14+uR51JVAmdqwKYXGRjEXx7s+WiagVjqQ+HPE+nnwyF2qlVG8evUsUHmPcA+6YXMEDbIhEyQc5A==}
    engines: {node: ^10.13.0 || ^12.13.0 || >=14.0.0}
    peerDependencies:
@ -2380,7 +2380,7 @@ packages:
      '@types/yargs-parser': 21.0.0
    dev: true

-  /@typescript-eslint/eslint-plugin/5.28.0_py5roj3ykd3sga4gtxlmfvv4pa:
+  /@typescript-eslint/eslint-plugin/5.28.0_7e3b17277850f72303869dd6c2d6bc78:
    resolution: {integrity: sha512-DXVU6Cg29H2M6EybqSg2A+x8DgO9TCUBRp4QEXQHJceLS7ogVDP0g3Lkg/SZCqcvkAP/RruuQqK0gdlkgmhSUA==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@ -2391,10 +2391,10 @@ packages:
      typescript:
        optional: true
    dependencies:
-      '@typescript-eslint/parser': 5.28.0_b5e7v2qnwxfo6hmiq56u52mz3e
+      '@typescript-eslint/parser': 5.28.0_eslint@8.18.0+typescript@4.7.4
      '@typescript-eslint/scope-manager': 5.28.0
-      '@typescript-eslint/type-utils': 5.28.0_b5e7v2qnwxfo6hmiq56u52mz3e
-      '@typescript-eslint/utils': 5.28.0_b5e7v2qnwxfo6hmiq56u52mz3e
+      '@typescript-eslint/type-utils': 5.28.0_eslint@8.18.0+typescript@4.7.4
+      '@typescript-eslint/utils': 5.28.0_eslint@8.18.0+typescript@4.7.4
      debug: 4.3.4
      eslint: 8.18.0
      functional-red-black-tree: 1.0.1
@ -2407,7 +2407,7 @@ packages:
      - supports-color
    dev: true

-  /@typescript-eslint/parser/5.28.0_b5e7v2qnwxfo6hmiq56u52mz3e:
+  /@typescript-eslint/parser/5.28.0_eslint@8.18.0+typescript@4.7.4:
    resolution: {integrity: sha512-ekqoNRNK1lAcKhZESN/PdpVsWbP9jtiNqzFWkp/yAUdZvJalw2heCYuqRmM5eUJSIYEkgq5sGOjq+ZqsLMjtRA==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@ -2435,7 +2435,7 @@ packages:
      '@typescript-eslint/visitor-keys': 5.28.0
    dev: true

-  /@typescript-eslint/type-utils/5.28.0_b5e7v2qnwxfo6hmiq56u52mz3e:
+  /@typescript-eslint/type-utils/5.28.0_eslint@8.18.0+typescript@4.7.4:
    resolution: {integrity: sha512-SyKjKh4CXPglueyC6ceAFytjYWMoPHMswPQae236zqe1YbhvCVQyIawesYywGiu98L9DwrxsBN69vGIVxJ4mQQ==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@ -2445,7 +2445,7 @@ packages:
      typescript:
        optional: true
    dependencies:
-      '@typescript-eslint/utils': 5.28.0_b5e7v2qnwxfo6hmiq56u52mz3e
+      '@typescript-eslint/utils': 5.28.0_eslint@8.18.0+typescript@4.7.4
      debug: 4.3.4
      eslint: 8.18.0
      tsutils: 3.21.0_typescript@4.7.4
@ -2480,7 +2480,7 @@ packages:
      - supports-color
    dev: true

-  /@typescript-eslint/utils/5.28.0_b5e7v2qnwxfo6hmiq56u52mz3e:
+  /@typescript-eslint/utils/5.28.0_eslint@8.18.0+typescript@4.7.4:
    resolution: {integrity: sha512-E60N5L0fjv7iPJV3UGc4EC+A3Lcj4jle9zzR0gW7vXhflO7/J29kwiTGITA2RlrmPokKiZbBy2DgaclCaEUs6g==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@ -3811,7 +3811,7 @@ packages:
    engines: {node: '>=10'}
    dev: true

-  /eslint-config-airbnb-base/14.2.1_srrmf5la5dmnsfe2mpg6sboreu:
+  /eslint-config-airbnb-base/14.2.1_9462c2f560e8d8d9149a63cde905d125:
    resolution: {integrity: sha512-GOrQyDtVEc1Xy20U7vsB2yAoB4nBlfH5HZJeatRXHleO+OS5Ot+MWij4Dpltw4/DyIkqUfqz1epfhVR5XWWQPA==}
    engines: {node: '>= 6'}
    peerDependencies:
@ -3820,13 +3820,13 @@ packages:
    dependencies:
      confusing-browser-globals: 1.0.11
      eslint: 8.18.0
-      eslint-plugin-import: 2.26.0_6lykrgsjl6r2vncmjcievjkgyy
+      eslint-plugin-import: 2.26.0_f2f0a89a495fa3aab44c48904aa546c6
      object.assign: 4.1.2
      object.entries: 1.1.5
    dev: true
    optional: true

-  /eslint-config-airbnb/18.2.1_hhb75kleu5rldjujnddbsd2niy:
+  /eslint-config-airbnb/18.2.1_39c3fea964a762b1a68968c6190f4d46:
    resolution: {integrity: sha512-glZNDEZ36VdlZWoxn/bUR1r/sdFKPd1mHPbqUtkctgNG4yT2DLLtJ3D+yCV+jzZCc2V1nBVkmdknOJBZ5Hc0fg==}
    engines: {node: '>= 6'}
    peerDependencies:
@ -3837,8 +3837,8 @@ packages:
      eslint-plugin-react-hooks: ^4 || ^3 || ^2.3.0 || ^1.7.0
    dependencies:
      eslint: 8.18.0
-      eslint-config-airbnb-base: 14.2.1_srrmf5la5dmnsfe2mpg6sboreu
-      eslint-plugin-import: 2.26.0_6lykrgsjl6r2vncmjcievjkgyy
+      eslint-config-airbnb-base: 14.2.1_9462c2f560e8d8d9149a63cde905d125
+      eslint-plugin-import: 2.26.0_f2f0a89a495fa3aab44c48904aa546c6
      eslint-plugin-jsx-a11y: 6.5.1_eslint@8.18.0
      eslint-plugin-react: 7.23.2_eslint@8.18.0
      eslint-plugin-react-hooks: 4.6.0_eslint@8.18.0
@ -3851,15 +3851,15 @@ packages:
    resolution: {integrity: sha512-a5d+flotDyzV+pefVGHxKmZWrid9MYcFXrhTsRnYCkAUcfM6WUWESlq8/8MHnKVd600+VPMeNbb3illDbMp3jA==}
    dependencies:
      '@babel/core': 7.18.5
-      '@babel/eslint-parser': 7.18.2_cz6e4qppzra6gosrrzcvbsxiom
+      '@babel/eslint-parser': 7.18.2_@babel+core@7.18.5+eslint@8.18.0
      '@babel/plugin-syntax-flow': 7.17.12_@babel+core@7.18.5
      '@babel/plugin-syntax-jsx': 7.17.12_@babel+core@7.18.5
-      '@typescript-eslint/eslint-plugin': 5.28.0_py5roj3ykd3sga4gtxlmfvv4pa
-      '@typescript-eslint/parser': 5.28.0_b5e7v2qnwxfo6hmiq56u52mz3e
+      '@typescript-eslint/eslint-plugin': 5.28.0_7e3b17277850f72303869dd6c2d6bc78
+      '@typescript-eslint/parser': 5.28.0_eslint@8.18.0+typescript@4.7.4
      eslint: 8.18.0
      eslint-config-prettier: 8.5.0_eslint@8.18.0
      eslint-plugin-html: 6.2.0
-      eslint-plugin-import: 2.26.0_6lykrgsjl6r2vncmjcievjkgyy
+      eslint-plugin-import: 2.26.0_f2f0a89a495fa3aab44c48904aa546c6
      eslint-plugin-json: 3.1.0
      eslint-plugin-node: 11.1.0_eslint@8.18.0
      eslint-plugin-only-warn: /@aminya/eslint-plugin-only-warn/1.2.2
@ -3872,7 +3872,7 @@ packages:
      typescript: 4.7.4
    optionalDependencies:
      coffeescript: 1.12.7
-      eslint-plugin-coffee: 0.1.15_xjtrcukvftenowg3m3ter25rtm
+      eslint-plugin-coffee: 0.1.15_ba671151552cc8d758db66e648ebb19b
      eslint-plugin-react-hooks: 4.6.0_eslint@8.18.0
    transitivePeerDependencies:
      - eslint-import-resolver-typescript
@ -3898,7 +3898,7 @@ packages:
      - supports-color
    dev: true

-  /eslint-module-utils/2.7.3_cfsupm63rr3qvqifljk6nmy67u:
+  /eslint-module-utils/2.7.3_116547b3db8c770ac1055a55e6b31efd:
    resolution: {integrity: sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==}
    engines: {node: '>=4'}
    peerDependencies:
@ -3916,7 +3916,7 @@ packages:
      eslint-import-resolver-webpack:
        optional: true
    dependencies:
-      '@typescript-eslint/parser': 5.28.0_b5e7v2qnwxfo6hmiq56u52mz3e
+      '@typescript-eslint/parser': 5.28.0_eslint@8.18.0+typescript@4.7.4
      debug: 3.2.7
      eslint-import-resolver-node: 0.3.6
      find-up: 2.1.0
@ -3924,21 +3924,21 @@ packages:
      - supports-color
    dev: true

-  /eslint-plugin-coffee/0.1.15_xjtrcukvftenowg3m3ter25rtm:
+  /eslint-plugin-coffee/0.1.15_ba671151552cc8d758db66e648ebb19b:
    resolution: {integrity: sha512-+qtkIPSc9etYqOODIlENqiRjID/oEoGMAAQJN988Aczy461NIwzaamFY6Fi0QDVVDb2v+OL/StVrk/QmyItfeg==}
    requiresBuild: true
    peerDependencies:
      eslint: '*'
    dependencies:
      axe-core: 3.5.6
-      babel-eslint: /@babel/eslint-parser/7.18.2_cz6e4qppzra6gosrrzcvbsxiom
+      babel-eslint: /@babel/eslint-parser/7.18.2_@babel+core@7.18.5+eslint@8.18.0
      babylon: 7.0.0-beta.47
      coffeescript: 2.7.0
      doctrine: 2.1.0
      eslint: 8.18.0
-      eslint-config-airbnb: 18.2.1_hhb75kleu5rldjujnddbsd2niy
-      eslint-config-airbnb-base: 14.2.1_srrmf5la5dmnsfe2mpg6sboreu
-      eslint-plugin-import: 2.26.0_6lykrgsjl6r2vncmjcievjkgyy
+      eslint-config-airbnb: 18.2.1_39c3fea964a762b1a68968c6190f4d46
+      eslint-config-airbnb-base: 14.2.1_9462c2f560e8d8d9149a63cde905d125
+      eslint-plugin-import: 2.26.0_f2f0a89a495fa3aab44c48904aa546c6
      eslint-plugin-jsx-a11y: 6.5.1_eslint@8.18.0
      eslint-plugin-react: 7.23.2_eslint@8.18.0
      eslint-plugin-react-native: 3.11.0_eslint@8.18.0
@ -3974,7 +3974,7 @@ packages:
      htmlparser2: 7.2.0
    dev: true

-  /eslint-plugin-import/2.26.0_6lykrgsjl6r2vncmjcievjkgyy:
+  /eslint-plugin-import/2.26.0_f2f0a89a495fa3aab44c48904aa546c6:
    resolution: {integrity: sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==}
    engines: {node: '>=4'}
    peerDependencies:
@ -3984,14 +3984,14 @@ packages:
      '@typescript-eslint/parser':
        optional: true
    dependencies:
-      '@typescript-eslint/parser': 5.28.0_b5e7v2qnwxfo6hmiq56u52mz3e
+      '@typescript-eslint/parser': 5.28.0_eslint@8.18.0+typescript@4.7.4
      array-includes: 3.1.5
      array.prototype.flat: 1.3.0
      debug: 2.6.9
      doctrine: 2.1.0
      eslint: 8.18.0
      eslint-import-resolver-node: 0.3.6
-      eslint-module-utils: 2.7.3_cfsupm63rr3qvqifljk6nmy67u
+      eslint-module-utils: 2.7.3_116547b3db8c770ac1055a55e6b31efd
      has: 1.0.3
      is-core-module: 2.9.0
      is-glob: 4.0.3
@ -7829,7 +7829,7 @@ packages:
    resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
    dev: false

-  /ts-jest/28.0.5_zv2ltmnvcc5apkdaecods742je:
+  /ts-jest/28.0.5_jest@28.1.1+typescript@4.7.4:
    resolution: {integrity: sha512-Sx9FyP9pCY7pUzQpy4FgRZf2bhHY3za576HMKJFs+OnQ9jS96Du5vNsDKkyedQkik+sEabbKAnCliv9BEsHZgQ==}
    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
    hasBin: true
@ -8280,8 +8280,8 @@ packages:
      readable-stream: 3.6.0
    dev: true

-  github.com/actions/setup-python/d09bd5e6005b175076f227b13d9730d56e9dcfcb:
-    resolution: {tarball: https://codeload.github.com/actions/setup-python/tar.gz/d09bd5e6005b175076f227b13d9730d56e9dcfcb}
+  github.com/actions/setup-python/ffcd00020c213885323d35524aa155f17870b8dd:
+    resolution: {tarball: https://codeload.github.com/actions/setup-python/tar.gz/ffcd00020c213885323d35524aa155f17870b8dd}
    name: setup-python
    version: 4.0.0
    dependencies:
--- a/src/python/actions_python.ts
+++ b/src/python/actions_python.ts
@ -8,26 +8,48 @@ import { isGitHubCI } from "../utils/env/isci"
 import { cacheDependencies } from "./actions_cache"

 function isPyPyVersion(versionSpec: string) {
-  return versionSpec.startsWith("pypy-")
+  return versionSpec.startsWith("pypy")
 }

+// 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) {
+//     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}`)
+
+//   return version
+// }
+
 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}`)
-    process.env.RUNNER_TOOL_CACHE = process.env.AGENT_TOOLSDIRECTORY
+    debug(`Python is expected to be installed into AGENT_TOOLSDIRECTORY=${process.env["AGENT_TOOLSDIRECTORY"]}`)
+    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)
      pythonVersion = `${installed.resolvedPyPyVersion}-${installed.resolvedPythonVersion}`
-      info(`Successfully setup PyPy ${installed.resolvedPyPyVersion} with Python (${installed.resolvedPythonVersion})`)
+      info(`Successfully set up PyPy ${installed.resolvedPyPyVersion} with Python (${installed.resolvedPythonVersion})`)
    } else {
      const installed = await useCpythonVersion(version, arch)
      pythonVersion = installed.version
-      info(`Successfully setup ${installed.impl} (${pythonVersion})`)
+      info(`Successfully set up ${installed.impl} (${pythonVersion})`)
    }

    const cache = "pip" // core.getInput("cache") // package manager used for caching