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

fix: check if the pip executable is working on windows

This commit is contained in:
Amin Yahyaabadi 2022-02-04 13:38:25 -08:00
parent 9a6f97440c
commit 7523d162da
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/setup_cpp.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/setup_cpp.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
src/python/python.ts
View File

@ -23,7 +23,7 @@ export function setupPython(version: string, setupDir: string, arch: string) {
export async function setupPythonViaSystem(version: string, setupDir: string, _arch: string) {
switch (process.platform) {
case "win32": {
await setupChocoPack("python3", version, [`/InstallDir:${setupDir}`])
setupChocoPack("python3", version, setupDir ? [`/InstallDir:${setupDir}`] : [])
// Adding the bin dir to the path
/** The directory which the tool is installed to */
activateWinPython(setupDir)

10
src/utils/setup/setupPipPack.ts
View File

@ -7,6 +7,7 @@ import { addPath } from "../path/addPath"
import { setupPython } from "../../python/python"
import { isBinUptoDate } from "./version"
import { join } from "path"
import { getVersion } from "../../default_versions"
let pip: string | undefined
@ -25,6 +26,15 @@ export async function setupPipPack(name: string, version?: string) {
pip = "pip3"
}
}
if (process.platform === "win32") {
try {
// test if pip executable is working
await execa(pip, ["--version"], { stdio: "inherit" })
} catch (err) {
await setupPython(getVersion("python", undefined), "", process.arch)
pip = "pip3"
}
}
execa.sync(pip, ["install", version !== undefined && version !== "" ? `${name}==${version}` : name], {
stdio: "inherit",