Merge pull request #76 from aminya/windows-unzip [skip ci]

Author: aminya

dist/setup_cpp.js

@@ -1,8 +1,9 @@
-import { extractZip, extractTar } from "@actions/tool-cache"
+import { extractTar } from "@actions/tool-cache"
 import semverLte from "semver/functions/lte"
 import semverCoerce from "semver/functions/coerce"
 import { setupBin, PackageInfo, InstallationInfo } from "../utils/setup/setupBin"
 import { addBinExtension } from "../utils/extension/extension"
+import { extractZip } from "../utils/setup/extract"
 
 /** Get the platform data for cmake */
 function getCmakePackageInfo(version: string, platform: NodeJS.Platform, arch: string): PackageInfo {

dist/setup_cpp.js.map

@@ -46,6 +46,7 @@ export async function setupDoxygen(version: string, setupDir: string, arch: stri
       try {
         // doxygen on stable Ubuntu repositories is very old. So, we use get the binary from the website itself
         installationInfo = await setupBin("doxygen", version, getDoxygenPackageInfo, setupDir, arch)
+        setupAptPack("libclang-cpp9")
       } catch (err) {
         notice(`Failed to download doxygen binary. ${err}. Falling back to apt-get.`)
         installationInfo = setupAptPack("doxygen", undefined)

pnpm-lock.yaml

@@ -1,5 +1,5 @@
-import { extractZip } from "@actions/tool-cache"
 import { addBinExtension } from "../utils/extension/extension"
+import { extractZip } from "../utils/setup/extract"
 import { setupBin, PackageInfo, InstallationInfo } from "../utils/setup/setupBin"
 
 /** Get the platform name Ninja uses in their download links */

src/cmake/cmake.ts

@@ -1,6 +1,5 @@
-import { extractZip } from "@actions/tool-cache"
 import { addBinExtension } from "../utils/extension/extension"
-import { extractTarByExe } from "../utils/setup/extract"
+import { extractTarByExe, extractZip } from "../utils/setup/extract"
 import { setupBin, PackageInfo, InstallationInfo } from "../utils/setup/setupBin"
 
 /** Get the platform name task uses in their download links */

src/doxygen/doxygen.ts

@@ -3,22 +3,36 @@ import { mkdirP } from "@actions/io"
 import which from "which"
 import { setupSevenZip } from "../../sevenzip/sevenzip"
 import { warning } from "../io/io"
-export { extractTar, extractXar, extract7z, extractZip } from "@actions/tool-cache"
+export { extractTar, extractXar } from "@actions/tool-cache"
 
 let sevenZip: string | undefined
 
-export async function extractExe(file: string, dest: string) {
-  // install 7z if needed
+/// Extract 7z using 7z
+export async function extract7Zip(file: string, dest: string) {
+  await execa(await getSevenZip(), ["x", file, `-o${dest}`], { stdio: "inherit" })
+  return dest
+}
+
+/// install 7z if needed
+async function getSevenZip() {
   if (sevenZip === undefined) {
     if (which.sync("7z", { nothrow: true }) === null) {
       await setupSevenZip("", "", process.arch)
     }
     // eslint-disable-next-line require-atomic-updates
     sevenZip = "7z"
   }
+  return sevenZip
+}
 
-  await execa(sevenZip, ["x", file, `-o${dest}`], { stdio: "inherit" })
-  return dest
+/// Extract Exe using 7z
+export async function extractExe(file: string, dest: string) {
+  return extract7Zip(file, dest)
+}
+
+/// Extract Zip using 7z
+export async function extractZip(file: string, dest: string) {
+  return extract7Zip(file, dest)
 }
 
 export async function extractTarByExe(file: string, dest: string, flags = ["--strip-components=0"]) {