mirror of
				https://github.com/threeal/cmake-action.git
				synced 2025-11-04 05:43:42 +00:00 
			
		
		
		
	feat: only install ninja if it was not installed
This commit is contained in:
		
							parent
							
								
									1275ae37d2
								
							
						
					
					
						commit
						2c8bab9566
					
				
							
								
								
									
										4
									
								
								main/index.mjs
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										4
									
								
								main/index.mjs
									
									
									
										generated
									
									
									
								
							@ -27238,6 +27238,8 @@ var __webpack_exports__ = {};
 | 
				
			|||||||
(() => {
 | 
					(() => {
 | 
				
			||||||
/* harmony import */ var _actions_core__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(2340);
 | 
					/* harmony import */ var _actions_core__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(2340);
 | 
				
			||||||
/* harmony import */ var _actions_exec__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(4926);
 | 
					/* harmony import */ var _actions_exec__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(4926);
 | 
				
			||||||
 | 
					/* harmony import */ var _actions_io__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(1793);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
async function main() {
 | 
					async function main() {
 | 
				
			||||||
@ -27247,7 +27249,7 @@ async function main() {
 | 
				
			|||||||
    const generator = _actions_core__WEBPACK_IMPORTED_MODULE_0__.getInput("generator");
 | 
					    const generator = _actions_core__WEBPACK_IMPORTED_MODULE_0__.getInput("generator");
 | 
				
			||||||
    if (generator)
 | 
					    if (generator)
 | 
				
			||||||
        configureArgs.push(...["-G", generator]);
 | 
					        configureArgs.push(...["-G", generator]);
 | 
				
			||||||
    if (generator.match(/ninja/gi)) {
 | 
					    if (generator.match(/ninja/gi) && !(await _actions_io__WEBPACK_IMPORTED_MODULE_2__.which("ninja"))) {
 | 
				
			||||||
        switch (process.platform) {
 | 
					        switch (process.platform) {
 | 
				
			||||||
            case "linux":
 | 
					            case "linux":
 | 
				
			||||||
                await _actions_exec__WEBPACK_IMPORTED_MODULE_1__.exec("sudo", ["apt", "install", "-y", "ninja-build"]);
 | 
					                await _actions_exec__WEBPACK_IMPORTED_MODULE_1__.exec("sudo", ["apt", "install", "-y", "ninja-build"]);
 | 
				
			||||||
 | 
				
			|||||||
@ -9,7 +9,8 @@
 | 
				
			|||||||
  },
 | 
					  },
 | 
				
			||||||
  "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",
 | 
				
			||||||
 | 
				
			|||||||
@ -1,5 +1,6 @@
 | 
				
			|||||||
import core from "@actions/core";
 | 
					import core from "@actions/core";
 | 
				
			||||||
import exec from "@actions/exec";
 | 
					import exec from "@actions/exec";
 | 
				
			||||||
 | 
					import io from "@actions/io";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
async function main() {
 | 
					async function main() {
 | 
				
			||||||
  const sourceDir = core.getInput("source-dir");
 | 
					  const sourceDir = core.getInput("source-dir");
 | 
				
			||||||
@ -10,7 +11,7 @@ async function main() {
 | 
				
			|||||||
  const generator = core.getInput("generator");
 | 
					  const generator = core.getInput("generator");
 | 
				
			||||||
  if (generator) configureArgs.push(...["-G", generator]);
 | 
					  if (generator) configureArgs.push(...["-G", generator]);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  if (generator.match(/ninja/gi)) {
 | 
					  if (generator.match(/ninja/gi) && !(await io.which("ninja"))) {
 | 
				
			||||||
    switch (process.platform) {
 | 
					    switch (process.platform) {
 | 
				
			||||||
      case "linux":
 | 
					      case "linux":
 | 
				
			||||||
        await exec.exec("sudo", ["apt", "install", "-y", "ninja-build"]);
 | 
					        await exec.exec("sudo", ["apt", "install", "-y", "ninja-build"]);
 | 
				
			||||||
 | 
				
			|||||||
@ -41,7 +41,7 @@ __metadata:
 | 
				
			|||||||
  languageName: node
 | 
					  languageName: node
 | 
				
			||||||
  linkType: hard
 | 
					  linkType: hard
 | 
				
			||||||
 | 
					
 | 
				
			||||||
"@actions/io@npm:^1.0.1":
 | 
					"@actions/io@npm:^1.0.1, @actions/io@npm:^1.1.3":
 | 
				
			||||||
  version: 1.1.3
 | 
					  version: 1.1.3
 | 
				
			||||||
  resolution: "@actions/io@npm:1.1.3"
 | 
					  resolution: "@actions/io@npm:1.1.3"
 | 
				
			||||||
  checksum: 5b8751918e5bf0bebd923ba917fb1c0e294401e7ff0037f32c92a4efa4215550df1f6633c63fd4efb2bdaae8711e69b9e36925857db1f38935ff62a5c92ec29e
 | 
					  checksum: 5b8751918e5bf0bebd923ba917fb1c0e294401e7ff0037f32c92a4efa4215550df1f6633c63fd4efb2bdaae8711e69b9e36925857db1f38935ff62a5c92ec29e
 | 
				
			||||||
@ -1617,6 +1617,7 @@ __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.8"
 | 
					    "@types/jest": "npm:^29.5.8"
 | 
				
			||||||
    "@types/node": "npm:^20.9.0"
 | 
					    "@types/node": "npm:^20.9.0"
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user