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

fix: fix the kcov binDir

This commit is contained in:
Amin Yahyaabadi 2022-07-27 17:42:04 -07:00
parent 4d96d91b82
commit f61dd0e6b8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/kcov/__tests__/kcov.test.ts
View File

@ -11,7 +11,7 @@ describe("setup-Kcov", () => {
return return
} }
it("should setup Kcov v40", async () => { it("should setup Kcov v40 via downloading the binaries", async () => {
const directory = await setupTmpDir("kcov-v40") const directory = await setupTmpDir("kcov-v40")
const { binDir } = (await setupKcov("40-binary", directory, "")) as InstallationInfo const { binDir } = (await setupKcov("40-binary", directory, "")) as InstallationInfo
// the prebuild binary only works on ubuntu 20.04 // the prebuild binary only works on ubuntu 20.04
@ -23,14 +23,14 @@ describe("setup-Kcov", () => {
await cleanupTmpDir("kcov-v40") await cleanupTmpDir("kcov-v40")
}) })
it("should setup Kcov v40", async () => { it("should build and setup Kcov v40", async () => {
const directory = await setupTmpDir("kcov-v40") const directory = await setupTmpDir("kcov-v40")
const { binDir } = (await setupKcov("40", directory, "")) as InstallationInfo const { binDir } = (await setupKcov("40", directory, "")) as InstallationInfo
await testBin("kcov", ["--version"], binDir) await testBin("kcov", ["--version"], binDir)
await cleanupTmpDir("kcov-v40") await cleanupTmpDir("kcov-v40")
}) })
it("should setup Kcov v39", async () => { it("should build and setup Kcov v39", async () => {
const directory = await setupTmpDir("kcov-v39") const directory = await setupTmpDir("kcov-v39")
const { binDir } = (await setupKcov("39", directory, "")) as InstallationInfo const { binDir } = (await setupKcov("39", directory, "")) as InstallationInfo
await testBin("kcov", ["--version"], binDir) await testBin("kcov", ["--version"], binDir)
@ -45,7 +45,7 @@ describe("setup-Kcov", () => {
// await cleanupTmpDir("kcov-v39") // await cleanupTmpDir("kcov-v39")
// }) // })
it("should setup Kcov v38", async () => { it("should build and setup Kcov v38", async () => {
try { try {
const directory2 = await setupTmpDir("kcov-v38") const directory2 = await setupTmpDir("kcov-v38")

2
src/kcov/kcov.ts
View File

@ -59,7 +59,7 @@ async function buildKcov(file: string, dest: string) {
await execa("cmake", ["--build", "./build", "--config", "Release"], { cwd: out, stdio: "inherit" }) await execa("cmake", ["--build", "./build", "--config", "Release"], { cwd: out, stdio: "inherit" })
// execSudo("cmake", ["--install", "./build"], out) // execSudo("cmake", ["--install", "./build"], out)
// return "user/local/bin" // the cmake install prefix // return "user/local/bin" // the cmake install prefix
return out return join(out, "build")
} }
export async function setupKcov(versionGiven: string, setupDir: string, arch: string) { export async function setupKcov(versionGiven: string, setupDir: string, arch: string) {