Fix unpacking steps

Author: kateinoigakukun

dist/index.js

@@ -2,6 +2,7 @@ const fs = require("fs");
 const core = require("@actions/core");
 const tc = require("@actions/tool-cache");
 const os = require("os");
+const path = require("path");
 
 async function run() {
   const version = resolveVersionInput();
@@ -20,17 +21,21 @@ async function installToolchain(url, version, platform) {
     core.info("Toolchain already installed.");
     return cachePath;
   }
-  core.debug(`Downloading tool from ${url}`);
+  core.info(`Downloading tool from ${url}`);
   const downloadPath = await tc.downloadTool(url);
   core.debug(`Installing toolchain from ${downloadPath}`);
   let toolchainPath;
   switch (platform.pkg) {
-    case "tar.gz":
-      toolchainPath = await tc.extractTar(downloadPath);
+    case "tar.gz": {
+      const extractedPath = await tc.extractTar(downloadPath);
+      toolchainPath = path.join(extractedPath, `swift-${version}`);
       break;
-    case "pkg":
-      toolchainPath = await tc.extractXar(downloadPath);
+    }
+    case "pkg": {
+      const extractedPath = await tc.extractXar(downloadPath);
+      toolchainPath = await tc.extractTar(path.join(extractedPath, "Payload"));
       break;
+    }
     default:
       throw new Error(`Unsupported package type: ${platform.pkg}`);
   }

dist/index.js.map

@@ -28,6 +28,7 @@
   "homepage": "https://github.com/swiftwasm/setup-swiftwasm#readme",
   "dependencies": {
     "@actions/core": "^1.10.0",
+    "@actions/exec": "^1.1.1",
     "@actions/tool-cache": "^2.0.1"
   },
   "devDependencies": {