Skip to content

Commit a18ed2e

Browse files
authored
Merge pull request #194 from aminya/update [skip ci]
2 parents 2d1ee7f + 8d969d8 commit a18ed2e

File tree

17 files changed

+96
-78
lines changed

17 files changed

+96
-78
lines changed

.eslintrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"ignorePatterns": ["dist/", "node_modules/", "dev/cpp_vcpkg_project"],
44
"rules": {
55
"no-unused-vars": "off",
6+
"no-empty-function": "off",
67
"@typescript-eslint/no-unused-vars": [
78
"warn",
89
{

dist/actions/setup-cpp.js

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/actions/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/legacy/setup-cpp.js

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/legacy/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/modern/setup-cpp.js

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/modern/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"test.lint": "run-p --aggregate-output --continue-on-error lint.cspell test.lint.eslint test.lint.prettier lint.tsc",
5555
"test.lint.eslint": "eslint **/*.{ts,tsx,js,jsx,cjs,mjs,json,yaml} --no-error-on-unmatched-pattern --cache --cache-location ./.cache/eslint/",
5656
"test.lint.prettier": "prettier . --check",
57-
"test": "jest",
57+
"test": "jest --runInBand --forceExit --coverage",
5858
"build.docker_tests": "node ./dev/docker/__tests__/generate-docker-tests.mjs",
5959
"build.docker.arch": "pnpm build.docker_tests && docker build -f ./dev/docker/__tests__/arch.dockerfile -t setup-cpp:arch .",
6060
"build.docker.fedora": "pnpm build.docker_tests && docker build -f ./dev/docker/__tests__/fedora.dockerfile -t setup-cpp:fedora .",

src/__tests__/main.test.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,18 @@ describe("getVersion", () => {
5555
it("gcovr", () => {
5656
expect(getVersion("gcovr", "5.0")).toBe("5.0")
5757
if (process.platform === "linux") {
58-
expect(getVersion("gcovr", "true", [22, 4])).toBe("5.2")
59-
expect(getVersion("gcovr", "true", [20, 4])).toBe("5.2")
60-
expect(getVersion("gcovr", "true", [18, 4])).toBe("5.0")
58+
expect(getVersion("gcovr", "true", [22, 4])).toBe(DefaultLinuxVersion.gcovr![22])
59+
expect(getVersion("gcovr", "true", [20, 4])).toBe(DefaultLinuxVersion.gcovr![20])
60+
expect(getVersion("gcovr", "true", [18, 4])).toBe(DefaultLinuxVersion.gcovr![18])
6161
}
6262
})
6363

6464
it("llvm", () => {
6565
expect(getVersion("llvm", "13.0.0")).toBe("13.0.0")
6666
if (process.platform === "linux") {
67-
expect(getVersion("llvm", "true", [20, 4])).toBe(DefaultLinuxVersion["llvm"]![20])
68-
expect(getVersion("llvm", "true", [18, 4])).toBe(DefaultLinuxVersion["llvm"]![18])
69-
expect(getVersion("llvm", "true", [16, 4])).toBe(DefaultLinuxVersion["llvm"]![16])
67+
expect(getVersion("llvm", "true", [20, 4])).toBe(DefaultLinuxVersion.llvm![20])
68+
expect(getVersion("llvm", "true", [18, 4])).toBe(DefaultLinuxVersion.llvm![18])
69+
expect(getVersion("llvm", "true", [16, 4])).toBe(DefaultLinuxVersion.llvm![16])
7070
}
7171
})
7272
})

src/brew/__tests__/brew.test.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ import { testBin } from "../../utils/tests/test-helpers"
33

44
jest.setTimeout(300000)
55
describe("setup-brew", () => {
6+
if (process.platform === "win32") {
7+
it.skip("should setup brew", () => {})
8+
return
9+
}
610
it("should setup brew", async () => {
7-
if (process.platform !== "darwin") {
8-
return
9-
}
1011
const installInfo = await setupBrew("", "", process.arch)
1112
await testBin("brew", ["--version"], installInfo?.binDir)
1213
})

0 commit comments

Comments
 (0)