mirror of
https://github.com/threeal/cmake-action.git
synced 2025-04-20 10:41:21 +00:00
feat: remove support for auto-install Ninja (#258)
* feat: remove support for auto-installing Ninja * ci: add step for setting up Ninja in `test-action-with-custom-tools` job * docs: update readme related to auto-install Ninja support removal
This commit is contained in:
parent
ebf367c0a0
commit
4427f0f36d
3
.github/workflows/test.yaml
vendored
3
.github/workflows/test.yaml
vendored
@ -185,6 +185,9 @@ jobs:
|
||||
test
|
||||
sparse-checkout-cone-mode: false
|
||||
|
||||
- name: Setup Ninja
|
||||
uses: seanmiddleditch/gha-setup-ninja@v4
|
||||
|
||||
- name: Configure, Build, and Test Project
|
||||
uses: ./
|
||||
with:
|
||||
|
@ -6,7 +6,6 @@ Configure and build your [CMake](https://cmake.org/) project using [GitHub Actio
|
||||
|
||||
- Configures a CMake project using the [`cmake`](https://cmake.org/cmake/help/latest/manual/cmake.1.html) command.
|
||||
- Optionally builds a CMake project using the `cmake --build` command.
|
||||
- Auto-detects and installs required dependencies.
|
||||
- Supports specifying multiple CMake options directly from the action inputs.
|
||||
|
||||
## Usage
|
||||
@ -84,6 +83,9 @@ jobs:
|
||||
#### Using Ninja as the Generator and Clang as the Compiler
|
||||
|
||||
```yaml
|
||||
- name: Setup Ninja
|
||||
uses: seanmiddleditch/gha-setup-ninja@v4
|
||||
|
||||
- name: Configure Project
|
||||
uses: threeal/cmake-action@v1.3.0
|
||||
with:
|
||||
|
16
dist/index.js
generated
vendored
16
dist/index.js
generated
vendored
@ -27698,8 +27698,6 @@ var __webpack_exports__ = {};
|
||||
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
|
||||
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
|
||||
|
||||
function getInputs() {
|
||||
@ -27722,26 +27720,12 @@ function getInputs() {
|
||||
|
||||
|
||||
|
||||
|
||||
async function main() {
|
||||
const inputs = getInputs();
|
||||
const configureArgs = [inputs.sourceDir, "-B", inputs.buildDir];
|
||||
if (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) {
|
||||
configureArgs.push("-DCMAKE_C_COMPILER=" + inputs.cCompiler);
|
||||
}
|
||||
|
@ -10,8 +10,7 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@actions/core": "^1.10.1",
|
||||
"@actions/exec": "^1.1.1",
|
||||
"@actions/io": "^1.1.3"
|
||||
"@actions/exec": "^1.1.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@jest/globals": "^29.7.0",
|
||||
|
15
src/index.ts
15
src/index.ts
@ -1,6 +1,5 @@
|
||||
import * as core from "@actions/core";
|
||||
import { exec } from "@actions/exec";
|
||||
import { which } from "@actions/io";
|
||||
import { getInputs } from "./inputs.js";
|
||||
|
||||
async function main() {
|
||||
@ -12,20 +11,6 @@ async function main() {
|
||||
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) {
|
||||
configureArgs.push("-DCMAKE_C_COMPILER=" + inputs.cCompiler);
|
||||
}
|
||||
|
3
yarn.lock
generated
3
yarn.lock
generated
@ -41,7 +41,7 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@actions/io@npm:^1.0.1, @actions/io@npm:^1.1.3":
|
||||
"@actions/io@npm:^1.0.1":
|
||||
version: 1.1.3
|
||||
resolution: "@actions/io@npm:1.1.3"
|
||||
checksum: 10c0/5b8751918e5bf0bebd923ba917fb1c0e294401e7ff0037f32c92a4efa4215550df1f6633c63fd4efb2bdaae8711e69b9e36925857db1f38935ff62a5c92ec29e
|
||||
@ -3857,7 +3857,6 @@ __metadata:
|
||||
dependencies:
|
||||
"@actions/core": "npm:^1.10.1"
|
||||
"@actions/exec": "npm:^1.1.1"
|
||||
"@actions/io": "npm:^1.1.3"
|
||||
"@jest/globals": "npm:^29.7.0"
|
||||
"@types/jest": "npm:^29.5.12"
|
||||
"@types/node": "npm:^20.11.28"
|
||||
|
Loading…
Reference in New Issue
Block a user