actions/cmake-action
1
0
Fork 0
mirror of https://github.com/threeal/cmake-action.git synced 2025-07-27 08:14:23 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

feat: remove support for auto-installing Ninja

Browse Source
This commit is contained in:
Alfi Maulana 2024-03-22 16:22:54 +07:00
parent ebf367c0a0
commit 7d0ebf05f6
No known key found for this signature in database
GPG Key ID: 2242A64C2A8DF5A4
4 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dist/index.js generated vendored
View File

@ -27698,8 +27698,6 @@ var __webpack_exports__ = {};
var core = __nccwpck_require__(2340); var core = __nccwpck_require__(2340);
// EXTERNAL MODULE: ../../../.yarn/berry/cache/@actions-exec-npm-1.1.1-90973d2f96-10c0.zip/node_modules/@actions/exec/lib/exec.js // EXTERNAL MODULE: ../../../.yarn/berry/cache/@actions-exec-npm-1.1.1-90973d2f96-10c0.zip/node_modules/@actions/exec/lib/exec.js
var exec = __nccwpck_require__(4926); var exec = __nccwpck_require__(4926);
// EXTERNAL MODULE: ../../../.yarn/berry/cache/@actions-io-npm-1.1.3-82d1cf012b-10c0.zip/node_modules/@actions/io/lib/io.js
var io = __nccwpck_require__(1793);
;// CONCATENATED MODULE: ./src/inputs.ts ;// CONCATENATED MODULE: ./src/inputs.ts
function getInputs() { function getInputs() {
@ -27722,26 +27720,12 @@ function getInputs() {
async function main() { async function main() {
const inputs = getInputs(); const inputs = getInputs();
const configureArgs = [inputs.sourceDir, "-B", inputs.buildDir]; const configureArgs = [inputs.sourceDir, "-B", inputs.buildDir];
if (inputs.generator) { if (inputs.generator) {
configureArgs.push(...["-G", inputs.generator]); configureArgs.push(...["-G", inputs.generator]);
} }
if (inputs.generator.match(/ninja/gi) && !(await (0,io.which)("ninja"))) {
switch (process.platform) {
case "linux":
await (0,exec.exec)("sudo", ["apt", "install", "-y", "ninja-build"]);
break;
case "darwin":
await (0,exec.exec)("brew", ["install", "ninja"]);
break;
case "win32":
await (0,exec.exec)("choco", ["install", "ninja"]);
break;
}
}
if (inputs.cCompiler) { if (inputs.cCompiler) {
configureArgs.push("-DCMAKE_C_COMPILER=" + inputs.cCompiler); configureArgs.push("-DCMAKE_C_COMPILER=" + inputs.cCompiler);
} }

3
package.json
View File

@ -10,8 +10,7 @@
}, },
"dependencies": { "dependencies": {
"@actions/core": "^1.10.1", "@actions/core": "^1.10.1",
"@actions/exec": "^1.1.1", "@actions/exec": "^1.1.1"
"@actions/io": "^1.1.3"
}, },
"devDependencies": { "devDependencies": {
"@jest/globals": "^29.7.0", "@jest/globals": "^29.7.0",

15
src/index.ts
View File

@ -1,6 +1,5 @@
import * as core from "@actions/core"; import * as core from "@actions/core";
import { exec } from "@actions/exec"; import { exec } from "@actions/exec";
import { which } from "@actions/io";
import { getInputs } from "./inputs.js"; import { getInputs } from "./inputs.js";
async function main() { async function main() {
@ -12,20 +11,6 @@ async function main() {
configureArgs.push(...["-G", inputs.generator]); configureArgs.push(...["-G", inputs.generator]);
} }
if (inputs.generator.match(/ninja/gi) && !(await which("ninja"))) {
switch (process.platform) {
case "linux":
await exec("sudo", ["apt", "install", "-y", "ninja-build"]);
break;
case "darwin":
await exec("brew", ["install", "ninja"]);
break;
case "win32":
await exec("choco", ["install", "ninja"]);
break;
}
}
if (inputs.cCompiler) { if (inputs.cCompiler) {
configureArgs.push("-DCMAKE_C_COMPILER=" + inputs.cCompiler); configureArgs.push("-DCMAKE_C_COMPILER=" + inputs.cCompiler);
} }

3
yarn.lock generated
View File

@ -41,7 +41,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@actions/io@npm:^1.0.1, @actions/io@npm:^1.1.3": "@actions/io@npm:^1.0.1":
version: 1.1.3 version: 1.1.3
resolution: "@actions/io@npm:1.1.3" resolution: "@actions/io@npm:1.1.3"
checksum: 10c0/5b8751918e5bf0bebd923ba917fb1c0e294401e7ff0037f32c92a4efa4215550df1f6633c63fd4efb2bdaae8711e69b9e36925857db1f38935ff62a5c92ec29e checksum: 10c0/5b8751918e5bf0bebd923ba917fb1c0e294401e7ff0037f32c92a4efa4215550df1f6633c63fd4efb2bdaae8711e69b9e36925857db1f38935ff62a5c92ec29e
@ -3857,7 +3857,6 @@ __metadata:
dependencies: dependencies:
"@actions/core": "npm:^1.10.1" "@actions/core": "npm:^1.10.1"
"@actions/exec": "npm:^1.1.1" "@actions/exec": "npm:^1.1.1"
"@actions/io": "npm:^1.1.3"
"@jest/globals": "npm:^29.7.0" "@jest/globals": "npm:^29.7.0"
"@types/jest": "npm:^29.5.12" "@types/jest": "npm:^29.5.12"
"@types/node": "npm:^20.11.28" "@types/node": "npm:^20.11.28"