fix: load home path with "os.homedir()" (#24)

refactor: define "PLATFORM" once in the global scope
foundry-rs · Jan 17, 2023 · 048ecf3 · 048ecf3
1 parent df3156c
commit 048ecf3
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 22 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -68343,19 +68343,20 @@ const cache = __nccwpck_require__(7799);
 const github = __nccwpck_require__(5438);
 const fs = __nccwpck_require__(7147);
 const os = __nccwpck_require__(2037);
+const path = __nccwpck_require__(1017);
 
-const CACHE_PATHS = ["~/.foundry/cache/rpc"];
+const HOME = os.homedir();
+const PLATFORM = os.platform();
+const CACHE_PATHS = [path.join(HOME, ".foundry/cache/rpc")];
 
 async function restoreRPCCache() {
-  const platform = os.platform();
-  const key = platform + "-foundry-chain-fork-" + github.context.sha;
-  const restoreKeys = [platform + "-foundry-chain-fork-"];
+  const key = PLATFORM + "-foundry-chain-fork-" + github.context.sha;
+  const restoreKeys = [PLATFORM + "-foundry-chain-fork-"];
   await cache.restoreCache(CACHE_PATHS, key, restoreKeys);
 }
 
 async function saveCache() {
-  const platform = os.platform();
-  const key = platform + "-foundry-chain-fork-" + github.context.sha;
+  const key = PLATFORM + "-foundry-chain-fork-" + github.context.sha;
   if (fs.existsSync(CACHE_PATHS[0])) {
     await cache.saveCache(CACHE_PATHS, key);
   }

diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/dist/save/index.js b/dist/save/index.js
@@ -66836,19 +66836,20 @@ const cache = __nccwpck_require__(7799);
 const github = __nccwpck_require__(5438);
 const fs = __nccwpck_require__(7147);
 const os = __nccwpck_require__(2037);
+const path = __nccwpck_require__(1017);
 
-const CACHE_PATHS = ["~/.foundry/cache/rpc"];
+const HOME = os.homedir();
+const PLATFORM = os.platform();
+const CACHE_PATHS = [path.join(HOME, ".foundry/cache/rpc")];
 
 async function restoreRPCCache() {
-  const platform = os.platform();
-  const key = platform + "-foundry-chain-fork-" + github.context.sha;
-  const restoreKeys = [platform + "-foundry-chain-fork-"];
+  const key = PLATFORM + "-foundry-chain-fork-" + github.context.sha;
+  const restoreKeys = [PLATFORM + "-foundry-chain-fork-"];
   await cache.restoreCache(CACHE_PATHS, key, restoreKeys);
 }
 
 async function saveCache() {
-  const platform = os.platform();
-  const key = platform + "-foundry-chain-fork-" + github.context.sha;
+  const key = PLATFORM + "-foundry-chain-fork-" + github.context.sha;
   if (fs.existsSync(CACHE_PATHS[0])) {
     await cache.saveCache(CACHE_PATHS, key);
   }

diff --git a/dist/save/index.js.map b/dist/save/index.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/cache.js b/src/cache.js
@@ -2,19 +2,20 @@ const cache = require("@actions/cache");
 const github = require("@actions/github");
 const fs = require("fs");
 const os = require("os");
+const path = require("path");
 
-const CACHE_PATHS = ["~/.foundry/cache/rpc"];
+const HOME = os.homedir();
+const PLATFORM = os.platform();
+const CACHE_PATHS = [path.join(HOME, ".foundry/cache/rpc")];
 
 async function restoreRPCCache() {
-  const platform = os.platform();
-  const key = platform + "-foundry-chain-fork-" + github.context.sha;
-  const restoreKeys = [platform + "-foundry-chain-fork-"];
+  const key = PLATFORM + "-foundry-chain-fork-" + github.context.sha;
+  const restoreKeys = [PLATFORM + "-foundry-chain-fork-"];
   await cache.restoreCache(CACHE_PATHS, key, restoreKeys);
 }
 
 async function saveCache() {
-  const platform = os.platform();
-  const key = platform + "-foundry-chain-fork-" + github.context.sha;
+  const key = PLATFORM + "-foundry-chain-fork-" + github.context.sha;
   if (fs.existsSync(CACHE_PATHS[0])) {
     await cache.saveCache(CACHE_PATHS, key);
   }