diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a2695a2..b725e9d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,4 +36,4 @@ jobs: run: curl https://bun.sh/install | bash - name: Try bun - run: bun \ No newline at end of file + run: /Users/runner/.bun/bin/bun \ No newline at end of file diff --git a/dist/utils/install.js b/dist/utils/install.js index b5d8378..101f775 100644 --- a/dist/utils/install.js +++ b/dist/utils/install.js @@ -2,13 +2,11 @@ import { cacheDir, downloadTool, extractZip, find } from '@actions/tool-cache'; import { restoreCache, saveCache } from '@actions/cache'; import { addPath, info } from '@actions/core'; import getAsset from './getAsset.js'; -import getHomeDir from './getHomeDir.js'; import { join } from 'path'; import { homedir } from 'os'; export default async (release) => { - console.log(getHomeDir(), homedir()); const asset = getAsset(release.assets); - const path = join(getHomeDir(), '.bun', 'bin', asset.name); + const path = join(homedir(), '.bun', 'bin', asset.name); const cache = find('bun', release.version) || await restoreCache([path], `bun-${process.platform}-${asset.name}-${release.version}`); if (cache) { info(`Using cached Bun installation from ${cache}.`); @@ -17,13 +15,13 @@ export default async (release) => { } info(`Downloading Bun from ${asset.asset.browser_download_url}.`); const zipPath = await downloadTool(asset.asset.browser_download_url); - const extracted = await extractZip(zipPath, join(getHomeDir(), '.bun', 'bin')); + const extracted = await extractZip(zipPath, join(homedir(), '.bun', 'bin')); const newCache = await cacheDir(extracted, 'bun', release.version); await saveCache([ join(extracted, asset.name) ], `bun-${process.platform}-${asset.name}-${release.version}`); info(`Cached Bun to ${newCache}.`); addPath(newCache); - const bunPath = join(getHomeDir(), '.bun', 'bin', asset.name); + const bunPath = join(homedir(), '.bun', 'bin', asset.name); addPath(bunPath); }; diff --git a/src/utils/getHomeDir.ts b/src/utils/getHomeDir.ts deleted file mode 100644 index 1da22a1..0000000 --- a/src/utils/getHomeDir.ts +++ /dev/null @@ -1,3 +0,0 @@ -export default () => { - return process.env[process.platform == 'win32' ? 'USERPROFILE' : 'HOME']; -}; \ No newline at end of file diff --git a/src/utils/install.ts b/src/utils/install.ts index 49f01b3..54f29ab 100644 --- a/src/utils/install.ts +++ b/src/utils/install.ts @@ -3,14 +3,12 @@ import { cacheDir, downloadTool, extractZip, find } from '@actions/tool-cache'; import { restoreCache, saveCache } from '@actions/cache'; import { addPath, info } from '@actions/core'; import getAsset from './getAsset.js'; -import getHomeDir from './getHomeDir.js'; import { join } from 'path'; import { homedir } from 'os'; export default async(release: Release) => { - console.log(getHomeDir(), homedir()); const asset = getAsset(release.assets); - const path = join(getHomeDir(), '.bun', 'bin', asset.name); + const path = join(homedir(), '.bun', 'bin', asset.name); const cache = find('bun', release.version) || await restoreCache([path], `bun-${process.platform}-${asset.name}-${release.version}`); if (cache) { info(`Using cached Bun installation from ${cache}.`); @@ -21,7 +19,7 @@ export default async(release: Release) => { info(`Downloading Bun from ${asset.asset.browser_download_url}.`); const zipPath = await downloadTool(asset.asset.browser_download_url); - const extracted = await extractZip(zipPath, join(getHomeDir(), '.bun', 'bin')); + const extracted = await extractZip(zipPath, join(homedir(), '.bun', 'bin')); const newCache = await cacheDir( extracted, @@ -35,6 +33,6 @@ export default async(release: Release) => { info(`Cached Bun to ${newCache}.`); addPath(newCache); - const bunPath = join(getHomeDir(), '.bun', 'bin', asset.name); + const bunPath = join(homedir(), '.bun', 'bin', asset.name); addPath(bunPath); } \ No newline at end of file