mirror of https://github.com/aminya/setup-cpp
fix: fix the kcov38 build src
This commit is contained in:
parent
7be188c748
commit
4cfe0b84c3
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -8,7 +8,7 @@ const DefaultVersions: Record<string, string> = {
|
||||||
conan: "1.45.0", // https://github.com/conan-io/conan/releases
|
conan: "1.45.0", // https://github.com/conan-io/conan/releases
|
||||||
meson: "0.61.2", // https://github.com/mesonbuild/meson/releases
|
meson: "0.61.2", // https://github.com/mesonbuild/meson/releases
|
||||||
python: "3.8.10",
|
python: "3.8.10",
|
||||||
kcov: "v39", // https://github.com/SimonKagstrom/kcov/releases
|
kcov: "39", // https://github.com/SimonKagstrom/kcov/releases
|
||||||
task: "3.11.0", // https://github.com/go-task/task/releases
|
task: "3.11.0", // https://github.com/go-task/task/releases
|
||||||
doxygen: "1.9.1", // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=doxygen
|
doxygen: "1.9.1", // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=doxygen
|
||||||
gcc: process.platform === "win32" ? "11.2.0.07112021" : "11",
|
gcc: process.platform === "win32" ? "11.2.0.07112021" : "11",
|
||||||
|
|
|
@ -1,37 +1,46 @@
|
||||||
import { setupKcov } from "../kcov"
|
import { setupKcov } from "../kcov"
|
||||||
import { setupTmpDir, cleanupTmpDir, testBin } from "../../utils/tests/test-helpers"
|
import { setupTmpDir, cleanupTmpDir, testBin } from "../../utils/tests/test-helpers"
|
||||||
import { InstallationInfo } from "../../utils/setup/setupBin"
|
import { InstallationInfo } from "../../utils/setup/setupBin"
|
||||||
|
import which from "which"
|
||||||
|
|
||||||
jest.setTimeout(300000)
|
jest.setTimeout(300000)
|
||||||
async function testKcov(version: string, directory: string) {
|
|
||||||
const { binDir } = (await setupKcov(version, directory, "")) as InstallationInfo
|
|
||||||
await testBin("kcov", ["--version"], binDir)
|
|
||||||
return binDir
|
|
||||||
}
|
|
||||||
|
|
||||||
describe("setup-Kcov", () => {
|
describe("setup-Kcov", () => {
|
||||||
if (process.platform !== "linux") {
|
if (process.platform !== "linux") {
|
||||||
it.todo("should setup kcov on non-linux")
|
it.todo("should setup kcov on non-linux")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
it("should setup Kcov v39", async () => {
|
let directory: string
|
||||||
const directory = await setupTmpDir("kcov-v39")
|
beforeAll(async () => {
|
||||||
await testKcov("v39", directory)
|
directory = await setupTmpDir("kcov-v39")
|
||||||
await cleanupTmpDir("kcov-v39")
|
|
||||||
})
|
})
|
||||||
|
|
||||||
// TODO
|
it("should setup Kcov v39", async () => {
|
||||||
// it("should setup Kcov v38", async () => {
|
const { binDir } = (await setupKcov("39", directory, "")) as InstallationInfo
|
||||||
// const directory = await setupTmpDir("kcov-v38")
|
await testBin("kcov", ["--version"], binDir)
|
||||||
// await testKcov("v38", directory)
|
})
|
||||||
|
|
||||||
|
// it("should find Kcov in the cache", async () => {
|
||||||
|
// const binDir = await testKcov("v39", directory)
|
||||||
|
// if (isGitHubCI()) {
|
||||||
|
// expect(binDir).toMatch(process.env.RUNNER_TOOL_CACHE ?? "hostedtoolcache")
|
||||||
|
// }
|
||||||
// await cleanupTmpDir("kcov-v39")
|
// await cleanupTmpDir("kcov-v39")
|
||||||
// })
|
// })
|
||||||
|
|
||||||
// it("should find Kcov in the cache", async () => {
|
it("should setup Kcov v38", async () => {
|
||||||
// const directory = await setupTmpDir("kcov-v39")
|
const directory2 = await setupTmpDir("kcov-v38")
|
||||||
// const binDir = await testKcov("v39", directory)
|
|
||||||
// expect(binDir.includes("hostedtoolcache")).toBeTruthy()
|
await setupKcov("38", directory2, "")
|
||||||
// await cleanupTmpDir("kcov-v39")
|
|
||||||
// })
|
expect(which.sync("kcov", { nothrow: true })).toBeTruthy()
|
||||||
|
|
||||||
|
await testBin("kcov", ["--version"], "usr/local/bin") // because of cmake --install
|
||||||
|
|
||||||
|
await cleanupTmpDir("kcov-v38")
|
||||||
|
})
|
||||||
|
|
||||||
|
afterAll(async () => {
|
||||||
|
await cleanupTmpDir("kcov-v38")
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
import execa from "execa"
|
import execa from "execa"
|
||||||
// import { join } from "path"
|
import { join } from "path"
|
||||||
// import { untildify_user as untildify } from "./utils/path/untildify"
|
import untildify from "untildify"
|
||||||
// import { setupCmake } from "../cmake/cmake"
|
import which from "which"
|
||||||
|
import { setupCmake } from "../cmake/cmake"
|
||||||
|
import { getVersion } from "../default_versions"
|
||||||
import { execSudo } from "../utils/exec/sudo"
|
import { execSudo } from "../utils/exec/sudo"
|
||||||
import { addBinExtension } from "../utils/extension/extension"
|
import { addBinExtension } from "../utils/extension/extension"
|
||||||
import { extractTarByExe } from "../utils/setup/extract"
|
import { extractTarByExe } from "../utils/setup/extract"
|
||||||
|
@ -16,7 +18,7 @@ function getKcovPackageInfo(version: string): PackageInfo {
|
||||||
}
|
}
|
||||||
if (version_number >= 39) {
|
if (version_number >= 39) {
|
||||||
return {
|
return {
|
||||||
url: `https://github.com/SimonKagstrom/kcov/releases/download/${version}/kcov-amd64.tar.gz`,
|
url: `https://github.com/SimonKagstrom/kcov/releases/download/v${version_number}/kcov-amd64.tar.gz`,
|
||||||
extractedFolderName: "",
|
extractedFolderName: "",
|
||||||
binRelativeDir: "usr/local/bin",
|
binRelativeDir: "usr/local/bin",
|
||||||
binFileName: addBinExtension("kcov"),
|
binFileName: addBinExtension("kcov"),
|
||||||
|
@ -28,21 +30,27 @@ function getKcovPackageInfo(version: string): PackageInfo {
|
||||||
extractedFolderName: `kcov-${version_number}`,
|
extractedFolderName: `kcov-${version_number}`,
|
||||||
binRelativeDir: "build/",
|
binRelativeDir: "build/",
|
||||||
binFileName: addBinExtension("kcov"),
|
binFileName: addBinExtension("kcov"),
|
||||||
extractFunction: async (file: string, dest: string): Promise<string> => {
|
extractFunction: buildKcov,
|
||||||
const out = await extractTarByExe(file, dest)
|
|
||||||
// build after extraction using CMake
|
|
||||||
// await setupCmake("3.22.0", join(untildify(""), "cmake"), "")
|
|
||||||
await setupAptPack("libdw-dev")
|
|
||||||
await setupAptPack("libcurl4-openssl-dev")
|
|
||||||
await execa("cmake", ["-S", "./", "-B", "./build"], { cwd: out, stdio: "inherit" })
|
|
||||||
await execa("cmake", ["--build", "./build", "--config", "Release"], { cwd: out, stdio: "inherit" })
|
|
||||||
await execSudo("cmake", ["--install", "./build"], out)
|
|
||||||
return out
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function buildKcov(file: string, dest: string) {
|
||||||
|
const out = await extractTarByExe(file, dest, ["--strip-components=1"])
|
||||||
|
// build after extraction using CMake
|
||||||
|
if (which.sync("cmake", { nothrow: true }) === null) {
|
||||||
|
await setupCmake(getVersion("cmake", undefined), join(untildify(""), "cmake"), "")
|
||||||
|
}
|
||||||
|
if (process.platform === "linux") {
|
||||||
|
await setupAptPack("libdw-dev")
|
||||||
|
await setupAptPack("libcurl4-openssl-dev")
|
||||||
|
}
|
||||||
|
await execa("cmake", ["-S", "./", "-B", "./build"], { cwd: out, stdio: "inherit" })
|
||||||
|
await execa("cmake", ["--build", "./build", "--config", "Release"], { cwd: out, stdio: "inherit" })
|
||||||
|
await execSudo("cmake", ["--install", "./build"], out)
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
export async function setupKcov(version: string, setupDir: string, arch: string) {
|
export async function setupKcov(version: string, setupDir: string, arch: string) {
|
||||||
switch (process.platform) {
|
switch (process.platform) {
|
||||||
case "linux": {
|
case "linux": {
|
||||||
|
|
|
@ -2,6 +2,7 @@ import execa from "execa"
|
||||||
import { mkdirP } from "@actions/io"
|
import { mkdirP } from "@actions/io"
|
||||||
import which from "which"
|
import which from "which"
|
||||||
import { setupSevenZip } from "../../sevenzip/sevenzip"
|
import { setupSevenZip } from "../../sevenzip/sevenzip"
|
||||||
|
import { warning } from "../io/io"
|
||||||
export { extractTar, extractXar, extract7z, extractZip } from "@actions/tool-cache"
|
export { extractTar, extractXar, extract7z, extractZip } from "@actions/tool-cache"
|
||||||
|
|
||||||
let sevenZip: string | undefined
|
let sevenZip: string | undefined
|
||||||
|
@ -26,6 +27,17 @@ export async function extractTarByExe(file: string, dest: string, flags = ["--st
|
||||||
} catch {
|
} catch {
|
||||||
// ignore
|
// ignore
|
||||||
}
|
}
|
||||||
await execa("tar", ["xf", file, "-C", dest, ...flags], { stdio: "inherit" })
|
|
||||||
|
// TODO windows fails to create symlinks
|
||||||
|
// https://github.com/heroku/heroku-slugs/issues/3
|
||||||
|
|
||||||
|
try {
|
||||||
|
await execa("tar", ["xf", file, "-C", dest, ...flags], { stdio: "inherit" })
|
||||||
|
} catch (e) {
|
||||||
|
if (process.platform === "win32" && (e as Error).message.includes("Can't create '\\\\?\\C:")) {
|
||||||
|
warning(`Failed to extract symlink ${file} to ${dest}. Ignoring this symlink.`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return dest
|
return dest
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue