feat: use homedir from os

This commit is contained in:
xHyroM 2022-07-12 09:39:16 +02:00
parent 20a5153038
commit 9fb3c0c9e9
4 changed files with 7 additions and 14 deletions

View File

@ -36,4 +36,4 @@ jobs:
run: curl https://bun.sh/install | bash
- name: Try bun
run: bun
run: /Users/runner/.bun/bin/bun

View File

@ -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);
};

View File

@ -1,3 +0,0 @@
export default () => {
return process.env[process.platform == 'win32' ? 'USERPROFILE' : 'HOME'];
};

View File

@ -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);
}