Revert "fix: update execa"

This reverts commit 12fe81a.

Author: aminya

dist/setup_cpp.js

@@ -33,7 +33,7 @@
     "@actions/exec": "^1.1.0",
     "@actions/io": "^1.1.1",
     "@actions/tool-cache": "^1.7.1",
-    "execa": "^6.0.0",
+    "execa": "^5.1.1",
     "hasha": "^5.2.2",
     "mri": "^1.2.0",
     "semver": "^7.3.5",

dist/setup_cpp.js.map

@@ -1,5 +1,5 @@
 /* eslint-disable require-atomic-updates */
-import * as execa from "execa"
+import execa from "execa"
 import { existsSync } from "fs"
 import { dirname } from "path"
 import which from "which"
@@ -30,7 +30,7 @@ export function setupChocolatey(
   }
 
   // https://docs.chocolatey.org/en-us/choco/setup#install-with-cmd.exe
-  execa.execaCommandSync(
+  execa.commandSync(
     `@"%SystemRoot%\\System32\\WindowsPowerShell\\v1.0\\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command "[System.Net.ServicePointManager]::SecurityProtocol = 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\\chocolatey\\bin"`
   )
 

package.json

@@ -19,9 +19,9 @@ export async function setupDoxygen(version: string | undefined, _setupDir: strin
        *      See the log for details (C:\ProgramData\chocolatey\logs\chocolatey.log).
        *     The process cannot access the file 'C:\ProgramData\chocolatey\lib\Graphviz\.chocolateyPending' because it is being used by another process.
        *
-       *       18 |     execa.execaSync("choco", ["install", "-y", name, `--version=${version}`, ...args])
+       *       18 |     execa.sync("choco", ["install", "-y", name, `--version=${version}`, ...args])
        *       19 |   } else {
-       *     > 20 |     execa.execaSync("choco", ["install", "-y", name, ...args])
+       *     > 20 |     execa.sync("choco", ["install", "-y", name, ...args])
        *          |           ^
        *       21 |   }
        *       22 |

pnpm-lock.yaml

@@ -1,4 +1,4 @@
-import * as execa from "execa"
+import execa from "execa"
 import which from "which"
 
 let _issudo: boolean | undefined = undefined
@@ -21,8 +21,8 @@ export function mightSudo(command: string) {
 
 export function execaSudo(file: string, args: string[]) {
   if (isRoot()) {
-    return execa.execaCommand(`sudo ${[file, ...args].join(" ")}`, { shell: true })
+    return execa.command(`sudo ${[file, ...args].join(" ")}`, { shell: true })
   } else {
-    return execa.execa(file, args)
+    return execa(file, args)
   }
 }

src/chocolatey/chocolatey.ts

@@ -1,7 +1,7 @@
 import { addPath as ghAddPath } from "@actions/core"
 import { delimiter } from "path"
 import * as core from "@actions/core"
-import * as execa from "execa"
+import execa from "execa"
 
 /** An add path function that works locally or inside GitHub Actions */
 export function addPath(path: string) {
@@ -12,13 +12,13 @@ export function addPath(path: string) {
       core.error(err as Error)
       switch (process.platform) {
         case "win32": {
-          execa.execaSync(`setx PATH=${path};%PATH%`)
+          execa.sync(`setx PATH=${path};%PATH%`)
           return
         }
         case "linux":
         case "darwin": {
-          execa.execaCommandSync(`echo "export PATH=${path}:$PATH" >> ~/.profile`)
-          execa.execaCommandSync(`source ~/.profile`)
+          execa.commandSync(`echo "export PATH=${path}:$PATH" >> ~/.profile`)
+          execa.commandSync(`source ~/.profile`)
           core.info(`${path} was added to ~/.profile`)
           return
         }

src/doxygen/doxygen.ts

@@ -1,9 +1,9 @@
-import * as execa from "execa"
+import execa from "execa"
 import { mkdirP } from "@actions/io"
 export { extractTar, extractXar, extract7z, extractZip } from "@actions/tool-cache"
 
 export async function extractExe(file: string, dest: string) {
-  await execa.execa("7z", ["x", file, `-o${dest}`])
+  await execa("7z", ["x", file, `-o${dest}`])
   return dest
 }
 
@@ -13,6 +13,6 @@ export async function extractTarByExe(file: string, dest: string, flags = ["--st
   } catch {
     // ignore
   }
-  await execa.execa("tar", ["xf", file, "-C", dest, ...flags])
+  await execa("tar", ["xf", file, "-C", dest, ...flags])
   return dest
 }

src/utils/env/sudo.ts

@@ -1,5 +1,5 @@
 /* eslint-disable require-atomic-updates */
-import * as execa from "execa"
+import execa from "execa"
 import which from "which"
 import { setupBrew } from "../../brew/brew"
 import { InstallationInfo } from "./setupBin"
@@ -14,7 +14,7 @@ export function setupBrewPack(name: string, version?: string): InstallationInfo
   }
 
   // brew is not thread-safe
-  execa.execaSync("brew", ["install", version !== undefined && version !== "" ? `${name}@${version}` : name])
+  execa.sync("brew", ["install", version !== undefined && version !== "" ? `${name}@${version}` : name])
 
   return { binDir: "/usr/local/bin/" }
 }

src/utils/path/addPath.ts

@@ -3,7 +3,7 @@ import { addPath } from "../path/addPath"
 import which from "which"
 import { setupChocolatey } from "../../chocolatey/chocolatey"
 import { InstallationInfo } from "./setupBin"
-import * as execa from "execa"
+import execa from "execa"
 
 let hasChoco = false
 
@@ -15,9 +15,9 @@ export async function setupChocoPack(name: string, version?: string, args: strin
   }
 
   if (version !== undefined && version !== "") {
-    execa.execaSync("choco", ["install", "-y", name, `--version=${version}`, ...args])
+    execa.sync("choco", ["install", "-y", name, `--version=${version}`, ...args])
   } else {
-    execa.execaSync("choco", ["install", "-y", name, ...args])
+    execa.sync("choco", ["install", "-y", name, ...args])
   }
 
   const binDir = "C:/ProgramData/Chocolatey/bin/"

src/utils/setup/extract.ts

@@ -1,6 +1,6 @@
 /* eslint-disable require-atomic-updates */
 import { getExecOutput } from "@actions/exec"
-import * as execa from "execa"
+import execa from "execa"
 import which from "which"
 import { info } from "@actions/core"
 import { addPath } from "../path/addPath"
@@ -26,7 +26,7 @@ export async function setupPipPack(name: string, version?: string) {
     }
   }
 
-  execa.execaSync(pip, ["install", version !== undefined && version !== "" ? `${name}==${version}` : name])
+  execa.sync(pip, ["install", version !== undefined && version !== "" ? `${name}==${version}` : name])
 
   if (binDir === undefined) {
     if (process.platform === "linux") {

src/utils/setup/setupBrewPack.ts

@@ -1,5 +1,5 @@
 import { addPath, warning } from "@actions/core"
-import * as execa from "execa"
+import execa from "execa"
 import { existsSync } from "fs"
 import { dirname, join } from "path"
 import which from "which"
@@ -12,11 +12,11 @@ let hasVCPKG = false
 export function setupVcpkg(_version: string, setupDir: string, _arch: string): InstallationInfo {
   if (!hasVCPKG || which.sync("vcpkg", { nothrow: true }) === null) {
     if (!existsSync(join(setupDir, addShellExtension("bootstrap-vcpkg")))) {
-      execa.execaSync("git", ["clone", "https://github.com/microsoft/vcpkg"], { cwd: dirname(setupDir) })
+      execa.sync("git", ["clone", "https://github.com/microsoft/vcpkg"], { cwd: dirname(setupDir) })
     } else {
       warning(`Vcpkg folder already exists at ${setupDir}`)
     }
-    execa.execaSync(addShellExtension(addShellHere("bootstrap-vcpkg")), { cwd: setupDir, shell: true })
+    execa.sync(addShellExtension(addShellHere("bootstrap-vcpkg")), { cwd: setupDir, shell: true })
     addPath(setupDir)
     hasVCPKG = true
     return { binDir: setupDir }