fix: fix skipping graphviz on macos

This commit is contained in:
Amin Yahyaabadi 2024-02-17 03:24:38 -08:00
parent 36d895f6c6
commit 77fbfe849b
No known key found for this signature in database
GPG Key ID: F52AF77F636088F0
9 changed files with 16 additions and 12 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -7,17 +7,17 @@ import { macosVersion } from "../../utils/env/macos_version"
jest.setTimeout(300000) jest.setTimeout(300000)
describe("setup-graphviz", () => { describe("setup-graphviz", () => {
if (process.platform === "darwin" && macosVersion()[0] <= 11) {
test.skip("Skipping graphviz test on macOS 11 or earlier", () => {})
return
}
let directory: string let directory: string
beforeAll(async () => { beforeAll(async () => {
directory = await setupTmpDir("graphviz") directory = await setupTmpDir("graphviz")
}) })
it("should setup graphviz", async () => { it("should setup graphviz", async () => {
if (macosVersion()[0] <= 11) {
test.todo("Skipping graphviz test on macOS 11 or earlier")
return
}
const installInfo = await setupGraphviz( const installInfo = await setupGraphviz(
getVersion("graphviz", undefined, await ubuntuVersion()), getVersion("graphviz", undefined, await ubuntuVersion()),
directory, directory,

View File

@ -6,7 +6,7 @@ import { execRootSync } from "admina"
jest.setTimeout(300000) jest.setTimeout(300000)
describe("setup-nala", () => { describe("setup-nala", () => {
if (!isUbuntu()) { if (!isUbuntu()) {
test.todo("should setup nala") test.skip("should setup nala", () => {})
return return
} }
it("should setup nala", async () => { it("should setup nala", async () => {

View File

@ -7,6 +7,10 @@ import memoize from "micro-memoize"
* @returns {number[]} - The macOS version as an array of numbers * @returns {number[]} - The macOS version as an array of numbers
*/ */
function macosVersion_raw() { function macosVersion_raw() {
if (process.platform !== "darwin") {
return []
}
const { version } = macosRelease() const { version } = macosRelease()
return version.split(".").map((v) => parseInt(v, 10)) return version.split(".").map((v) => parseInt(v, 10))
} }