Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update cmake, gcovr, kcov, meson, task, doxygen, gcc #194

Merged
merged 5 commits into from
Sep 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"ignorePatterns": ["dist/", "node_modules/", "dev/cpp_vcpkg_project"],
"rules": {
"no-unused-vars": "off",
"no-empty-function": "off",
"@typescript-eslint/no-unused-vars": [
"warn",
{
Expand Down
30 changes: 15 additions & 15 deletions dist/actions/setup-cpp.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/actions/setup-cpp.js.map

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions dist/legacy/setup-cpp.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/legacy/setup-cpp.js.map

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions dist/modern/setup-cpp.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/modern/setup-cpp.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"test.lint": "run-p --aggregate-output --continue-on-error lint.cspell test.lint.eslint test.lint.prettier lint.tsc",
"test.lint.eslint": "eslint **/*.{ts,tsx,js,jsx,cjs,mjs,json,yaml} --no-error-on-unmatched-pattern --cache --cache-location ./.cache/eslint/",
"test.lint.prettier": "prettier . --check",
"test": "jest",
"test": "jest --runInBand --forceExit --coverage",
"build.docker_tests": "node ./dev/docker/__tests__/generate-docker-tests.mjs",
"build.docker.arch": "pnpm build.docker_tests && docker build -f ./dev/docker/__tests__/arch.dockerfile -t setup-cpp:arch .",
"build.docker.fedora": "pnpm build.docker_tests && docker build -f ./dev/docker/__tests__/fedora.dockerfile -t setup-cpp:fedora .",
Expand Down
12 changes: 6 additions & 6 deletions src/__tests__/main.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,18 @@ describe("getVersion", () => {
it("gcovr", () => {
expect(getVersion("gcovr", "5.0")).toBe("5.0")
if (process.platform === "linux") {
expect(getVersion("gcovr", "true", [22, 4])).toBe("5.2")
expect(getVersion("gcovr", "true", [20, 4])).toBe("5.2")
expect(getVersion("gcovr", "true", [18, 4])).toBe("5.0")
expect(getVersion("gcovr", "true", [22, 4])).toBe(DefaultLinuxVersion.gcovr![22])
expect(getVersion("gcovr", "true", [20, 4])).toBe(DefaultLinuxVersion.gcovr![20])
expect(getVersion("gcovr", "true", [18, 4])).toBe(DefaultLinuxVersion.gcovr![18])
}
})

it("llvm", () => {
expect(getVersion("llvm", "13.0.0")).toBe("13.0.0")
if (process.platform === "linux") {
expect(getVersion("llvm", "true", [20, 4])).toBe(DefaultLinuxVersion["llvm"]![20])
expect(getVersion("llvm", "true", [18, 4])).toBe(DefaultLinuxVersion["llvm"]![18])
expect(getVersion("llvm", "true", [16, 4])).toBe(DefaultLinuxVersion["llvm"]![16])
expect(getVersion("llvm", "true", [20, 4])).toBe(DefaultLinuxVersion.llvm![20])
expect(getVersion("llvm", "true", [18, 4])).toBe(DefaultLinuxVersion.llvm![18])
expect(getVersion("llvm", "true", [16, 4])).toBe(DefaultLinuxVersion.llvm![16])
}
})
})
7 changes: 4 additions & 3 deletions src/brew/__tests__/brew.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ import { testBin } from "../../utils/tests/test-helpers"

jest.setTimeout(300000)
describe("setup-brew", () => {
if (process.platform === "win32") {
it.skip("should setup brew", () => {})
return
}
it("should setup brew", async () => {
if (process.platform !== "darwin") {
return
}
const installInfo = await setupBrew("", "", process.arch)
await testBin("brew", ["--version"], installInfo?.binDir)
})
Expand Down
7 changes: 4 additions & 3 deletions src/chocolatey/__tests__/chocolatey.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ import { setupChocolatey } from "../chocolatey"

jest.setTimeout(300000)
describe("setup-chocolatey", () => {
if (process.platform !== "win32") {
it.skip("should setup chocolatey", () => {})
return
}
it("should setup chocolatey", async () => {
if (process.platform !== "win32") {
return
}
const { binDir } = (await setupChocolatey("", "", process.arch)) as InstallationInfo
await testBin("choco", ["--version"], binDir)
})
Expand Down
8 changes: 6 additions & 2 deletions src/gcc/gcc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ interface MingwInfo {

// https://github.com/brechtsanders/winlibs_mingw/releases
const GccToMingwInfo = {
"13": { releaseName: "13.1.0posix-16.0.3-11.0.0-ucrt-r1", fileSuffix: "13.1.0-mingw-w64ucrt-11.0.0-r1" },
"13": { releaseName: "13.2.0-16.0.6-11.0.0-ucrt-r1", fileSuffix: "13.2.0-mingw-w64ucrt-11.0.0-r1" },
"13.2-ucrt": { releaseName: "13.2.0-16.0.6-11.0.0-ucrt-r1", fileSuffix: "13.2.0-mingw-w64ucrt-11.0.0-r1" },
"13.2-ucrt-mcf": { releaseName: "13.2.0mcf-16.0.6-11.0.1-ucrt-r2", fileSuffix: "13.2.0-mingw-w64ucrt-11.0.1-r2" },
"13.2-msvcrt": { releaseName: "13.2.0-16.0.6-11.0.1-msvcrt-r1", fileSuffix: "13.2.0-mingw-w64msvcrt-11.0.1-r1" },
"13.1-ucrt": { releaseName: "13.1.0posix-16.0.3-11.0.0-ucrt-r1", fileSuffix: "13.1.0-mingw-w64ucrt-11.0.0-r1" },
"13.1-msvcrt": { releaseName: "13.1.0posix-16.0.3-11.0.0-msvcrt-r1", fileSuffix: "13.1.0-mingw-w64msvcrt-11.0.0-r1" },
"12": { releaseName: "12.3.0-16.0.4-11.0.0-ucrt-r1", fileSuffix: "12.3.0-mingw-w64ucrt-11.0.0-r1" },
Expand All @@ -44,7 +47,8 @@ const GccToMingwInfo = {
"11.3.0-msvcrt": { releaseName: "11.3.0-14.0.3-10.0.0-msvcrt-r3", fileSuffix: "11.3.0-mingw-w64msvcrt-10.0.0-r3" },
"11.2.0-ucrt": { releaseName: "11.2.0-9.0.0-ucrt-r5", fileSuffix: "11.2.0-mingw-w64ucrt-9.0.0-r5" },
"11.2.0-msvcrt": { releaseName: "11.2.0-9.0.0-msvcrt-r5", fileSuffix: "11.2.0-mingw-w64msvcrt-9.0.0-r5" },
"10": { releaseName: "10.3.0-12.0.0-9.0.0-r2", fileSuffix: "10.3.0-llvm-12.0.0-mingw-w64-9.0.0-r2" },
"10": { releaseName: "10.5.0-11.0.1-msvcrt-r1", fileSuffix: "10.5.0-mingw-w64msvcrt-11.0.1-r1" },
"10.5.0-msvcrt": { releaseName: "10.5.0-11.0.1-msvcrt-r1", fileSuffix: "10.5.0-mingw-w64msvcrt-11.0.1-r1" },
"10.3.0": { releaseName: "10.3.0-12.0.0-9.0.0-r2", fileSuffix: "10.3.0-llvm-12.0.0-mingw-w64-9.0.0-r2" },
"10.2.0": { releaseName: "10.2.0-7.0.0-r4", fileSuffix: "10.2.0-llvm-10.0.1-mingw-w64-7.0.0-r4" },
"9": { releaseName: "9.4.0-9.0.0-r1", fileSuffix: "9.4.0-mingw-w64-9.0.0-r1" },
Expand Down
14 changes: 8 additions & 6 deletions src/macos-sdk/__tests__/macos-sdk.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ import { setupMacOSSDK } from "../macos-sdk"

jest.setTimeout(300000)
describe("setup-macos-sdk", () => {
if (process.platform !== "darwin") {
it.skip("should setup macos-sdk", () => {})
return
}
it("should setup macos-sdk", async () => {
if (process.platform === "darwin") {
process.env.SDKROOT = undefined
await setupMacOSSDK()
expect(process.env.SDKROOT).toBeTruthy()
expect(typeof process.env.SDKROOT).toBe("string")
}
process.env.SDKROOT = undefined
await setupMacOSSDK()
expect(process.env.SDKROOT).toBeTruthy()
expect(typeof process.env.SDKROOT).toBe("string")
})
})
16 changes: 8 additions & 8 deletions src/msvc/__tests__/msvc.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@ import { warning } from "ci-log"

jest.setTimeout(300000)
describe("setup-msvc", () => {
const isWindows = process.platform === "win32"

if (process.platform !== "win32") {
it.skip("should setup msvc", () => {})
return
}
it("should setup the pre-installed msvc", async () => {
try {
if (!isWindows) {
return
}
await setupMSVC("", "", process.arch)
console.log(which.sync("cl"))
} catch (err) {
Expand All @@ -22,10 +21,11 @@ describe("setup-msvc", () => {
})

for (const version of [2022, 2019, 2017, 2015]) {
if (runnerWindowsVersion() !== undefined && runnerWindowsVersion()! > version) {
it.skip(`should setup msvc ${version}`, () => {})
return
}
it(`should setup msvc ${version}`, async () => {
if (!isWindows || (runnerWindowsVersion() !== undefined && runnerWindowsVersion()! > version)) {
return
}
try {
await setupMSVC(`${version}`, "", process.arch)
console.log(which.sync("cl"))
Expand Down
14 changes: 11 additions & 3 deletions src/nala/__tests__/nala.test.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
import { setupNala } from "../nala"
import { testBin } from "../../utils/tests/test-helpers"
import { isUbuntu } from "../../utils/env/isUbuntu"
import { execRootSync } from "admina"

jest.setTimeout(300000)
describe("setup-nala", () => {
if (!isUbuntu()) {
test.skip("should setup nala", () => {})
return
}
it("should setup nala", async () => {
if (!isUbuntu()) {
return
}
const installInfo = await setupNala("", "", process.arch)
await testBin("nala", ["--version"], installInfo?.binDir)
})

afterAll(() => {
// remove nala to run the rest of the tests with apt-get
execRootSync("apt-get", ["remove", "-y", "nala"])
execRootSync("apt-get", ["remove", "-y", "nala-legacy"])
})
})
7 changes: 4 additions & 3 deletions src/opencppcoverage/__tests__/opencppcoverage.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ import { testBin } from "../../utils/tests/test-helpers"

jest.setTimeout(300000)
describe("setup-OpenCppCoverage", () => {
if (process.platform !== "win32") {
it.skip("should setup OpenCppCoverage", () => {})
return
}
it("should setup OpenCppCoverage", async () => {
if (process.platform !== "win32") {
return
}
const installationInfo = await setupOpencppcoverage("", "", process.arch)

await testBin("OpenCppCoverage", null, installationInfo?.binDir) // OpenCppCoverage exits with non-zero even with --help
Expand Down
22 changes: 11 additions & 11 deletions src/versions/default_versions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ export const DefaultVersions: Record<string, string | undefined> = {
clangtidy: getLLVMDefault(),
clangformat: getLLVMDefault(),
ninja: "1.11.1", // https://github.com/ninja-build/ninja/releases
cmake: "3.26.4", // https://github.com/Kitware/CMake/releases
gcovr: "5.2", // https://pypi.org/project/gcovr/
conan: "1.60.0", // https://github.com/conan-io/conan/releases
meson: "1.0.2", // https://github.com/mesonbuild/meson/releases
kcov: "41", // https://github.com/SimonKagstrom/kcov/releases
task: "3.25.0", // https://github.com/go-task/task/releases
doxygen: isArch() ? "1.9.6-1" : "1.9.7", // https://www.doxygen.nl/download.html // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=doxygen // https://formulae.brew.sh/formula/doxygen // https://archlinux.org/packages/extra/x86_64/doxygen/
gcc: isArch() ? "13.1.1-1" : "13", // https://github.com/brechtsanders/winlibs_mingw/releases and // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=gcc
cmake: "3.27.4", // https://github.com/Kitware/CMake/releases
gcovr: "6.0", // https://pypi.org/project/gcovr/
conan: "1.60.2", // https://github.com/conan-io/conan/releases
meson: "1.2.1", // https://github.com/mesonbuild/meson/releases
kcov: "42", // https://github.com/SimonKagstrom/kcov/releases
task: "3.29.1", // https://github.com/go-task/task/releases
doxygen: isArch() ? "1.9.8-1" : "1.9.8", // https://www.doxygen.nl/download.html // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=doxygen // https://formulae.brew.sh/formula/doxygen // https://archlinux.org/packages/extra/x86_64/doxygen/
gcc: isArch() ? "13.2.1-3" : "13", // https://github.com/brechtsanders/winlibs_mingw/releases and // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=gcc
//mingw: isArch() ? "12.2.0-1" : "8", // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=mingw-w64 // https://archlinux.org/packages/extra/x86_64/mingw-w64-gcc/
}

Expand Down Expand Up @@ -75,8 +75,8 @@ export const DefaultLinuxVersion: Record<string, Record<number, string> | undefi
14: "13.0.0-ubuntu-16.04",
},
gcovr: {
22: "5.2",
20: "5.2",
22: "6.0",
20: "6.0",
18: "5.0",
},
meson: {
Expand All @@ -92,7 +92,7 @@ export const DefaultLinuxVersion: Record<string, Record<number, string> | undefi
14: "legacy",
},
kcov: {
22: "40",
22: "42-binary",
20: "40-binary", // https://github.com/SimonKagstrom/kcov/releases
18: "40",
16: "40",
Expand Down
Loading