fix: add option for setup-cpp cli install

Author: aminya

README.md

@@ -31,7 +31,7 @@ Setting up a **cross-platform** environment for building and testing C++/C proje
 | --------------- | ----------------------------------------------------------------------------------------------------------- |
 | compiler        | llvm, gcc, msvc, apple-clang, vcvarsall                                                                     |
 | build system    | cmake, ninja, meson, make, task, bazel                                                                      |
-| package manager | vcpkg, conan, choco, brew, nala                                                                             |
+| package manager | vcpkg, conan, choco, brew, nala, setup-cpp                                                                  |
 | analyzer/linter | clang-tidy, clang-format, cppcheck, cpplint, flawfinder, lizard, infer, cmakelang, cmake-format, cmake-lint |
 | cache           | ccache, sccache                                                                                             |
 | documentation   | doxygen, graphviz                                                                                           |
@@ -195,11 +195,14 @@ jobs:
           cppcheck: true # instead of `true`, which chooses the default version, you can pass a specific version.
 ```
 
-When using the `setup-cpp` action in GitHub Actions, it will also install the `setup-cpp` CLI, which you can use in the subsequent commands if needed:
+When using the `setup-cpp` action in GitHub Actions, by default it will also install the `setup-cpp` CLI, which you can use in the subsequent commands. You can modify the default behaviour if needed.
 
 ```yaml
   - name: Setup Cpp
     uses: aminya/setup-cpp@v1
+    with:
+      setup-cpp: true
+      node-package-manager: "npm"
 
   - name: Use Setup Cpp CLI
     run: setup-cpp --compiler llvm --cmake true --ninja true --ccache true --vcpkg true

action.yml

@@ -157,7 +157,10 @@ inputs:
   python:
     description: "Wether to install python (true/false) or the specific version to install."
     required: false
-  nodePackageManager:
+  setup-cpp:
+    description: "Wether to install setup-cpp (true/false) or the specific version to install. (Default to the current version called by the action)"
+    required: false
+  node-package-manager:
     description: "The node package manager to use (npm/yarn/pnpm) when installing setup-cpp globally"
     required: false
 

dist/legacy/setup-cpp.js

@@ -6,11 +6,14 @@ import { type Inputs, inputs } from "./tool.js"
 import type { InstallationInfo } from "./utils/setup/setupBin.js"
 
 export function parseArgs(args: string[]): Opts {
-  return mri<Record<Inputs, string | undefined> & { help: boolean; version: boolean }>(args, {
-    string: [...inputs, "timeout", "nodePackageManager"],
-    default: Object.fromEntries(inputs.map((inp) => [inp, maybeGetInput(inp)])),
+  const defaults = Object.fromEntries(inputs.map((inp) => [inp, maybeGetInput(inp)]))
+  defaults["setup-cpp"] = "true"
+
+  return mri<Record<Inputs, string | undefined> & { help: boolean; version: boolean; "setup-cpp": boolean }>(args, {
+    string: [...inputs, "timeout", "node-package-manager"],
+    default: defaults,
     alias: { h: "help", v: "version" },
-    boolean: ["help", "version"],
+    boolean: ["help", "version", "setup-cpp"],
   })
 }
 
@@ -41,7 +44,7 @@ All the available tools:
       "build system": {
         tools: "--cmake, --ninja, --meson, --make, --task, --bazel",
       },
-      "package manager": { tools: "--vcpkg, --conan, --choco, --brew, --nala" },
+      "package manager": { tools: "--vcpkg, --conan, --choco, --brew, --nala, --setup-cpp" },
       "analyzer/linter": {
         tools:
           "--clang-tidy, --clang-format, --cppcheck, --cpplint, --flawfinder, --lizard, --infer, , --cmakelang, --cmake-lint, --cmake-format",
@@ -67,8 +70,9 @@ export type Opts = mri.Argv<
   Record<Inputs, string | undefined> & {
     help: boolean
     version: boolean
+    "setup-cpp": boolean
     timeout?: string
-    nodePackageManager?: string
+    "node-package-manager"?: string
   }
 >
 

dist/legacy/setup-cpp.js.map

@@ -1,5 +1,6 @@
 import { error, info } from "ci-log"
 import { execa } from "execa"
+import which from "which"
 /**
  * Install the setup-cpp CLI globally
  * @param version - The version of setup-cpp to install
@@ -8,8 +9,8 @@ import { execa } from "execa"
 export async function installSetupCpp(version: string, packageManager: string = "npm") {
   try {
     // check if `setup-cpp` is available in the shell, if so, skip the installation to avoid overwriting the existing version
-    const { stdout } = await execa("setup-cpp", ["--version"])
-    if (stdout) {
+    const setupCppPath = await which("setup-cpp", { nothrow: true })
+    if (setupCppPath !== null) {
       return
     }
 

dist/modern/setup-cpp.mjs

@@ -28,7 +28,9 @@ async function main(args: string[]): Promise<number> {
   // parse options using mri or github actions
   const opts = parseArgs(args)
 
-  const installSetupCppPromise = installSetupCpp(packageJson.version, opts.nodePackageManager)
+  const installSetupCppPromise = opts["setup-cpp"]
+    ? installSetupCpp(packageJson.version, opts["node-package-manager"])
+    : Promise.resolve()
 
   // print help
   if (opts.help) {