Skip to content

Commit 5465644

Browse files
committed
feat: skip graphviz installation on older MacOS
f
1 parent 88ef2fc commit 5465644

File tree

10 files changed

+44
-18
lines changed

10 files changed

+44
-18
lines changed

dist/actions/setup-cpp.js

Lines changed: 3 additions & 3 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: 8 additions & 8 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: 3 additions & 3 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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@
102102
"execa": "^7.2.0",
103103
"is-url-online": "^1.5.0",
104104
"jest": "^29.7.0",
105+
"macos-release": "^3.2.0",
105106
"micro-memoize": "^4.1.2",
106107
"mkdirp": "^3.0.1",
107108
"mri": "^1.2.0",

pnpm-lock.yaml

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

src/doxygen/doxygen.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import { isUbuntu } from "../utils/env/isUbuntu"
1717
import { pathExists } from "path-exists"
1818
import retry from "retry-as-promised"
1919
import { ubuntuVersion } from "../utils/env/ubuntu_version"
20+
import { macosVersion } from "../utils/env/macos_version"
2021

2122
/** Get the platform data for cmake */
2223
// eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -64,7 +65,10 @@ export async function setupDoxygen(version: string, setupDir: string, arch: stri
6465
}
6566
case "darwin": {
6667
const installationInfo = await setupBrewPack("doxygen", undefined)
67-
await setupGraphviz(getVersion("graphviz", undefined), "", arch)
68+
// only install graphviz if the macOS version is greater than 11
69+
if (macosVersion()[0] > 11) {
70+
await setupGraphviz(getVersion("graphviz", undefined), "", arch)
71+
}
6872
return installationInfo
6973
}
7074
case "linux": {

src/utils/env/macos_version.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import macosRelease from "macos-release"
2+
import memoize from "micro-memoize"
3+
4+
/**
5+
* Get macOS version
6+
*
7+
* @returns {number[]} - The macOS version as an array of numbers
8+
*/
9+
function macosVersion_raw() {
10+
const { version } = macosRelease()
11+
return version.split(".").map((v) => parseInt(v, 10))
12+
}
13+
export const macosVersion = memoize(macosVersion_raw)

0 commit comments

Comments
 (0)