actions
/
setup-cpp
Template
mirror of https://github.com/aminya/setup-cpp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: separate setupActionsPython

This commit is contained in:
Amin Yahyaabadi 2021-09-20 07:24:17 -05:00
parent 3dd8e43133
commit 44478af66e
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/python/actions_python.ts Normal file
View File

@ -0,0 +1,23 @@
import * as core from "@actions/core"
import * as finder from "./setup-python/src/find-python"
import * as finderPyPy from "./setup-python/src/find-pypy"
import * as path from "path"
function isPyPyVersion(versionSpec: string) {
return versionSpec.startsWith("pypy-")
}
export async function setupActionsPython(version: string, _setupCppDir: string, arch: string) {
if (isPyPyVersion(version)) {
const installed = await finderPyPy.findPyPyVersion(version, arch)
core.info(
`Successfully setup PyPy ${installed.resolvedPyPyVersion} with Python (${installed.resolvedPythonVersion})`
)
} else {
const installed = await finder.findPythonVersion(version, arch)
core.info(`Successfully setup ${installed.impl} (${installed.version})`)
}
const matchersPath = path.join("setup-pthon", ".github")
core.info(`##[add-matcher]${path.join(matchersPath, "python.json")}`)
return undefined
}

24
src/python/python.ts
View File

@ -1,7 +1,4 @@
import * as core from "@actions/core" import * as core from "@actions/core"
import * as finder from "./setup-python/src/find-python"
import * as finderPyPy from "./setup-python/src/find-pypy"
import * as path from "path"
import { addPath } from "../utils/path/addPath" import { addPath } from "../utils/path/addPath"
import { setupAptPack } from "../utils/setup/setupAptPack" import { setupAptPack } from "../utils/setup/setupAptPack"
import { setupBrewPack } from "../utils/setup/setupBrewPack" import { setupBrewPack } from "../utils/setup/setupBrewPack"
@ -9,30 +6,15 @@ import { setupChocoPack } from "../utils/setup/setupChocoPack"
import hasha from "hasha" import hasha from "hasha"
import { join } from "path" import { join } from "path"
import { isCI } from "../utils/env/isci" import { isCI } from "../utils/env/isci"
import { setupActionsPython } from "./actions_python"
function isPyPyVersion(versionSpec: string) { export function setupPython(version: string, setupCppDir: string, arch: string) {
return versionSpec.startsWith("pypy-")
}
export async function setupPython(version: string, setupCppDir: string, arch: string) {
if (!isCI()) { if (!isCI()) {
// TODO parse versoin // TODO parse versoin
return setupPythonViaSystem("", setupCppDir, arch) return setupPythonViaSystem("", setupCppDir, arch)
} }
try { try {
if (isPyPyVersion(version)) { return setupActionsPython(version, setupCppDir, arch)
const installed = await finderPyPy.findPyPyVersion(version, arch)
core.info(
`Successfully setup PyPy ${installed.resolvedPyPyVersion} with Python (${installed.resolvedPythonVersion})`
)
} else {
const installed = await finder.findPythonVersion(version, arch)
core.info(`Successfully setup ${installed.impl} (${installed.version})`)
}
const matchersPath = path.join("setup-pthon", ".github")
core.info(`##[add-matcher]${path.join(matchersPath, "python.json")}`)
return undefined
} catch (err) { } catch (err) {
return setupPythonViaSystem(version, setupCppDir, arch) return setupPythonViaSystem(version, setupCppDir, arch)
} }