Skip to content

Commit b38973b

Browse files
committed
Fix ninja path for macos-arm CI tests
1 parent 289c1e2 commit b38973b

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

scripts/buildNinjaBinary.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ if (platform === "win32") {
2020
}
2121

2222
const src = path.join(ninjaDir, `ninja${platform === "win32" ? ".exe" : ""}`);
23-
24-
const dst =
25-
platform === "darwin" && process.arch === "arm64"
26-
? path.join(__dirname, "..", process.platform + process.arch, `ninja.exe`)
27-
: path.join(__dirname, "..", platform, `ninja.exe`);
23+
const dst = require("./bin_path").ninja_exe;
2824

2925
fs.copyFileSync(src, dst);

scripts/ciTest.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ function init() {
5757
vendorOCamlPath + path.delimiter + process.env["PATH"];
5858
}
5959

60-
var ninjaPath = path.join(__dirname, "..", process.platform, "ninja.exe");
60+
var ninjaPath = require("./bin_path").ninja_exe;
6161

6262
if (!fs.existsSync(ninjaPath)) {
6363
throw new Error("ninja could not be configured");

0 commit comments

Comments
 (0)