Update cached path: cargo-dist archives contains folders...

aiken-lang · May 24, 2024 · 09384fd · 09384fd
1 parent a49a7c3
commit 09384fd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -30784,7 +30784,12 @@ async function main() {
 
       const extractPath = await _actions_tool_cache__WEBPACK_IMPORTED_MODULE_1__.extractTar(tarPath, undefined, ["xzC"]);
 
-      cachedPath = await _actions_tool_cache__WEBPACK_IMPORTED_MODULE_1__.cacheDir(extractPath, "aiken", version);
+      cachedPath = await _actions_tool_cache__WEBPACK_IMPORTED_MODULE_1__.cacheDir(useCargoDist
+        ? _actions_core__WEBPACK_IMPORTED_MODULE_0__.toPlatformPath(`${extractPath}/aiken-${arch}-${platform}`)
+        : extractPath,
+        "aiken",
+        version
+      );
     }
 
     _actions_core__WEBPACK_IMPORTED_MODULE_0__.addPath(cachedPath);

diff --git a/src/main.js b/src/main.js
@@ -52,7 +52,12 @@ async function main() {
 
       const extractPath = await tc.extractTar(tarPath, undefined, ["xzC"]);
 
-      cachedPath = await tc.cacheDir(extractPath, "aiken", version);
+      cachedPath = await tc.cacheDir(useCargoDist
+        ? core.toPlatformPath(`${extractPath}/aiken-${arch}-${platform}`)
+        : extractPath,
+        "aiken",
+        version
+      );
     }
 
     core.addPath(cachedPath);