Skip to content

Commit 77fbfe8

Browse files
committed
fix: fix skipping graphviz on macos
1 parent 36d895f commit 77fbfe8

File tree

9 files changed

+16
-12
lines changed

9 files changed

+16
-12
lines changed

dist/actions/setup-cpp.js

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/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: 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.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: 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.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.

src/graphviz/__tests__/graphviz.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ import { macosVersion } from "../../utils/env/macos_version"
77

88
jest.setTimeout(300000)
99
describe("setup-graphviz", () => {
10+
if (process.platform === "darwin" && macosVersion()[0] <= 11) {
11+
test.skip("Skipping graphviz test on macOS 11 or earlier", () => {})
12+
return
13+
}
14+
1015
let directory: string
1116
beforeAll(async () => {
1217
directory = await setupTmpDir("graphviz")
1318
})
1419

1520
it("should setup graphviz", async () => {
16-
if (macosVersion()[0] <= 11) {
17-
test.todo("Skipping graphviz test on macOS 11 or earlier")
18-
return
19-
}
20-
2121
const installInfo = await setupGraphviz(
2222
getVersion("graphviz", undefined, await ubuntuVersion()),
2323
directory,

src/nala/__tests__/nala.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { execRootSync } from "admina"
66
jest.setTimeout(300000)
77
describe("setup-nala", () => {
88
if (!isUbuntu()) {
9-
test.todo("should setup nala")
9+
test.skip("should setup nala", () => {})
1010
return
1111
}
1212
it("should setup nala", async () => {

src/utils/env/macos_version.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ import memoize from "micro-memoize"
77
* @returns {number[]} - The macOS version as an array of numbers
88
*/
99
function macosVersion_raw() {
10+
if (process.platform !== "darwin") {
11+
return []
12+
}
13+
1014
const { version } = macosRelease()
1115
return version.split(".").map((v) => parseInt(v, 10))
1216
}

0 commit comments

Comments
 (0)