Skip to content

Commit 91abe1a

Browse files
committed
Use tool-cache implementation of extractXar
1 parent d93c5ba commit 91abe1a

File tree

1 file changed

+1
-14
lines changed

1 file changed

+1
-14
lines changed

src/macos-install.ts

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ async function download({ url }: Package) {
5454

5555
async function unpack({ name }: Package, packagePath: string, version: string) {
5656
core.debug("Extracting package");
57-
const unpackedPath = await extractXar(packagePath);
57+
const unpackedPath = await toolCache.extractXar(packagePath);
5858
const extractedPath = await toolCache.extractTar(
5959
path.join(unpackedPath, `${name}-package.pkg`, "Payload")
6060
);
@@ -67,16 +67,3 @@ async function unpack({ name }: Package, packagePath: string, version: string) {
6767
core.debug("Package cached");
6868
return cachedPath;
6969
}
70-
71-
//FIXME: Workaround until https://github.com/actions/toolkit/pull/207 is merged
72-
export async function extractXar(file: string): Promise<string> {
73-
const dest = path.join(
74-
process.env["RUNNER_TEMP"] || "",
75-
"setup-swift",
76-
"extract.tmp"
77-
);
78-
await io.mkdirP(dest);
79-
const xarPath: string = await io.which("xar", true);
80-
await exec(`"${xarPath}"`, ["-x", "-C", dest, "-f", file]);
81-
return dest;
82-
}

0 commit comments

Comments
 (0)