Fix build.ninja not found

Author: BSFishy

dist/index.js

@@ -975,13 +975,12 @@ const exec = __importStar(__webpack_require__(986));
 const io = __importStar(__webpack_require__(1));
 const path = __importStar(__webpack_require__(622));
 const fs = __importStar(__webpack_require__(747));
-// var hasbin = require('hasbin');
 const NINJA = 'ninja';
 const MESON = 'meson';
 const PYTHON = 'python';
 const CLANG_TIDY = 'clang-tidy';
 const GCOVR = 'gcovr';
-const NINJA_FILE = 'ninja.build';
+const NINJA_FILE = 'build.ninja';
 const ACTION = 'action';
 const BUILD = 'build';
 const INSTALL = 'install';
@@ -1086,12 +1085,6 @@ function findPython() {
             if (python.length < 1)
                 throw new Error('Python could not be found');
             core.debug('Found Python using which');
-            // if (hasbin.sync(PYTHON)) {
-            //     core.debug('Found Python in the path');
-            //     python = PYTHON;
-            // } else {
-            //     throw new Error('Python could not be found');
-            // }
         }
         pythonCache = python;
         return python;
@@ -1100,10 +1093,6 @@ function findPython() {
 function findNinja() {
     return __awaiter(this, void 0, void 0, function* () {
         core.debug('Checking for Ninja...');
-        // if (hasbin.sync(NINJA)) {
-        //     core.debug('Found Ninja in the path')
-        //     return;
-        // }
         try {
             const ninja = yield io.which(NINJA);
             if (ninja.length < 1)
@@ -1125,11 +1114,6 @@ function findNinja() {
 function findMeson() {
     return __awaiter(this, void 0, void 0, function* () {
         core.debug('Checking for Meson...');
-        // await checkNinja();
-        // if (hasbin.sync(MESON)) {
-        //     core.debug('Found Meson in the path');
-        //     return;
-        // }
         try {
             const meson = yield io.which(MESON);
             if (meson.length < 1)
@@ -1151,10 +1135,6 @@ function findMeson() {
 function findCoverage() {
     return __awaiter(this, void 0, void 0, function* () {
         core.debug(`Checking for ${COVERAGE}`);
-        // if (hasbin.sync(GCOVR)) {
-        //     core.debug('Found gcovr in the path');
-        //     return;
-        // }
         try {
             const gcovr = yield io.which(GCOVR);
             if (gcovr.length < 1)
@@ -1180,8 +1160,6 @@ function findTidy() {
         if (tidy.length < 1)
             throw new Error('Clang-tidy must be installed to run it');
         return tidy;
-        // if (!hasbin.sync(CLANG_TIDY))
-        //     throw new Error('Clang-tidy must be installed to run it');
     });
 }
 function run() {

src/main.ts

@@ -4,15 +4,13 @@ import * as io from '@actions/io';
 import * as path from 'path';
 import * as fs from 'fs';
 
-// var hasbin = require('hasbin');
-
 const NINJA: string = 'ninja';
 const MESON: string = 'meson';
 const PYTHON: string = 'python';
 const CLANG_TIDY: string = 'clang-tidy';
 const GCOVR: string = 'gcovr'
 
-const NINJA_FILE: string = 'ninja.build';
+const NINJA_FILE: string = 'build.ninja';
 
 const ACTION: string = 'action';
 const BUILD: string = 'build';
@@ -131,13 +129,6 @@ async function findPython(): Promise<string> {
             throw new Error('Python could not be found');
 
         core.debug('Found Python using which');
-
-        // if (hasbin.sync(PYTHON)) {
-        //     core.debug('Found Python in the path');
-        //     python = PYTHON;
-        // } else {
-        //     throw new Error('Python could not be found');
-        // }
     }
 
     pythonCache = python;
@@ -147,11 +138,6 @@ async function findPython(): Promise<string> {
 async function findNinja(): Promise<string> {
     core.debug('Checking for Ninja...');
 
-    // if (hasbin.sync(NINJA)) {
-    //     core.debug('Found Ninja in the path')
-    //     return;
-    // }
-
     try {
         const ninja: string = await io.which(NINJA);
         if (ninja.length < 1)
@@ -175,12 +161,6 @@ async function findNinja(): Promise<string> {
 async function findMeson(): Promise<string> {
     core.debug('Checking for Meson...');
 
-    // await checkNinja();
-
-    // if (hasbin.sync(MESON)) {
-    //     core.debug('Found Meson in the path');
-    //     return;
-    // }
     try {
         const meson: string = await io.which(MESON);
         if (meson.length < 1)
@@ -203,11 +183,6 @@ async function findMeson(): Promise<string> {
 
 async function findCoverage(): Promise<string> {
     core.debug(`Checking for ${COVERAGE}`);
-
-    // if (hasbin.sync(GCOVR)) {
-    //     core.debug('Found gcovr in the path');
-    //     return;
-    // }
 
     try {
         const gcovr: string = await io.which(GCOVR);
@@ -237,8 +212,6 @@ async function findTidy(): Promise<string> {
         throw new Error('Clang-tidy must be installed to run it');
 
     return tidy;
-    // if (!hasbin.sync(CLANG_TIDY))
-    //     throw new Error('Clang-tidy must be installed to run it');
 }
 
 export async function run() {