Merge pull request #92 from fwal/extract

Use extractXar from tool-cache

Author: fwal

package-lock.json

@@ -34,7 +34,7 @@
     "@actions/core": "^1.2.4",
     "@actions/exec": "^1.0.4",
     "@actions/io": "^1.0.2",
-    "@actions/tool-cache": "^1.5.5",
+    "@actions/tool-cache": "^1.6.0",
     "getos": "^3.2.1",
     "semver": "^7.3.2"
   },

package.json

@@ -54,7 +54,7 @@ async function download({ url }: Package) {
 
 async function unpack({ name }: Package, packagePath: string, version: string) {
   core.debug("Extracting package");
-  const unpackedPath = await extractXar(packagePath);
+  const unpackedPath = await toolCache.extractXar(packagePath);
   const extractedPath = await toolCache.extractTar(
     path.join(unpackedPath, `${name}-package.pkg`, "Payload")
   );
@@ -67,16 +67,3 @@ async function unpack({ name }: Package, packagePath: string, version: string) {
   core.debug("Package cached");
   return cachedPath;
 }
-
-//FIXME: Workaround until https://github.com/actions/toolkit/pull/207 is merged
-export async function extractXar(file: string): Promise<string> {
-  const dest = path.join(
-    process.env["RUNNER_TEMP"] || "",
-    "setup-swift",
-    "extract.tmp"
-  );
-  await io.mkdirP(dest);
-  const xarPath: string = await io.which("xar", true);
-  await exec(`"${xarPath}"`, ["-x", "-C", dest, "-f", file]);
-  return dest;
-}