mirror of
https://github.com/astral-sh/setup-uv.git
synced 2025-01-31 22:41:27 +08:00
more debug logs
This commit is contained in:
parent
65e8a8ce38
commit
eb355a21cb
21
dist/setup/index.js
generated
vendored
21
dist/setup/index.js
generated
vendored
@ -85411,18 +85411,18 @@ function downloadLatest(platform, arch, checkSum, githubToken) {
|
|||||||
core.info(`Downloading uv from "${downloadUrl}" ...`);
|
core.info(`Downloading uv from "${downloadUrl}" ...`);
|
||||||
const downloadPath = yield tc.downloadTool(downloadUrl, undefined, githubToken);
|
const downloadPath = yield tc.downloadTool(downloadUrl, undefined, githubToken);
|
||||||
let uvExecutablePath;
|
let uvExecutablePath;
|
||||||
let extracted;
|
let extractedDir;
|
||||||
if (platform === 'pc-windows-msvc') {
|
if (platform === 'pc-windows-msvc') {
|
||||||
extracted = yield tc.extractZip(downloadPath);
|
extractedDir = yield tc.extractZip(downloadPath);
|
||||||
uvExecutablePath = path.join(extracted, 'uv.exe');
|
uvExecutablePath = path.join(extractedDir, 'uv.exe');
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
extracted = yield tc.extractTar(downloadPath);
|
extractedDir = yield tc.extractTar(downloadPath);
|
||||||
uvExecutablePath = path.join(extracted, 'uv');
|
uvExecutablePath = path.join(extractedDir, 'uv');
|
||||||
}
|
}
|
||||||
const version = yield getVersion(uvExecutablePath);
|
const version = yield getVersion(uvExecutablePath);
|
||||||
yield (0, checksum_1.validateChecksum)(checkSum, extracted, arch, platform, version);
|
yield (0, checksum_1.validateChecksum)(checkSum, downloadPath, arch, platform, version);
|
||||||
const cachedToolDir = yield tc.cacheDir(downloadPath, utils_1.TOOL_CACHE_NAME, version, arch);
|
const cachedToolDir = yield tc.cacheDir(extractedDir, utils_1.TOOL_CACHE_NAME, version, arch);
|
||||||
return { cachedToolDir, version };
|
return { cachedToolDir, version };
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -85494,6 +85494,9 @@ const core = __importStar(__nccwpck_require__(2186));
|
|||||||
const tc = __importStar(__nccwpck_require__(7784));
|
const tc = __importStar(__nccwpck_require__(7784));
|
||||||
const utils_1 = __nccwpck_require__(239);
|
const utils_1 = __nccwpck_require__(239);
|
||||||
const checksum_1 = __nccwpck_require__(4622);
|
const checksum_1 = __nccwpck_require__(4622);
|
||||||
|
const fs = __importStar(__nccwpck_require__(7147));
|
||||||
|
const util = __importStar(__nccwpck_require__(3837));
|
||||||
|
const readdir = util.promisify(fs.readdir);
|
||||||
function tryGetFromToolCache(arch, version) {
|
function tryGetFromToolCache(arch, version) {
|
||||||
core.debug(`Trying to get uv from tool cache for ${version}...`);
|
core.debug(`Trying to get uv from tool cache for ${version}...`);
|
||||||
const cachedVersions = tc.findAllVersions(utils_1.TOOL_CACHE_NAME, arch);
|
const cachedVersions = tc.findAllVersions(utils_1.TOOL_CACHE_NAME, arch);
|
||||||
@ -85521,6 +85524,10 @@ function downloadVersion(platform, arch, version, checkSum, githubToken) {
|
|||||||
else {
|
else {
|
||||||
extractedDir = yield tc.extractTar(downloadPath);
|
extractedDir = yield tc.extractTar(downloadPath);
|
||||||
}
|
}
|
||||||
|
core.info(`Extracted uv to "${extractedDir}"`);
|
||||||
|
// list the contents of extracted dir
|
||||||
|
const files = yield readdir(extractedDir);
|
||||||
|
core.info(`Contents of extracted directory: ${files.join(', ')}`);
|
||||||
return yield tc.cacheDir(extractedDir, utils_1.TOOL_CACHE_NAME, version, arch);
|
return yield tc.cacheDir(extractedDir, utils_1.TOOL_CACHE_NAME, version, arch);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -27,18 +27,18 @@ export async function downloadLatest(
|
|||||||
githubToken
|
githubToken
|
||||||
)
|
)
|
||||||
let uvExecutablePath: string
|
let uvExecutablePath: string
|
||||||
let extracted: string
|
let extractedDir: string
|
||||||
if (platform === 'pc-windows-msvc') {
|
if (platform === 'pc-windows-msvc') {
|
||||||
extracted = await tc.extractZip(downloadPath)
|
extractedDir = await tc.extractZip(downloadPath)
|
||||||
uvExecutablePath = path.join(extracted, 'uv.exe')
|
uvExecutablePath = path.join(extractedDir, 'uv.exe')
|
||||||
} else {
|
} else {
|
||||||
extracted = await tc.extractTar(downloadPath)
|
extractedDir = await tc.extractTar(downloadPath)
|
||||||
uvExecutablePath = path.join(extracted, 'uv')
|
uvExecutablePath = path.join(extractedDir, 'uv')
|
||||||
}
|
}
|
||||||
const version = await getVersion(uvExecutablePath)
|
const version = await getVersion(uvExecutablePath)
|
||||||
await validateChecksum(checkSum, extracted, arch, platform, version)
|
await validateChecksum(checkSum, downloadPath, arch, platform, version)
|
||||||
const cachedToolDir = await tc.cacheDir(
|
const cachedToolDir = await tc.cacheDir(
|
||||||
downloadPath,
|
extractedDir,
|
||||||
TOOL_CACHE_NAME,
|
TOOL_CACHE_NAME,
|
||||||
version,
|
version,
|
||||||
arch
|
arch
|
||||||
|
@ -4,6 +4,11 @@ import {OWNER, REPO, TOOL_CACHE_NAME} from '../utils/utils'
|
|||||||
import {Architecture, Platform} from '../utils/platforms'
|
import {Architecture, Platform} from '../utils/platforms'
|
||||||
import {validateChecksum} from './checksum/checksum'
|
import {validateChecksum} from './checksum/checksum'
|
||||||
|
|
||||||
|
import * as fs from 'fs'
|
||||||
|
import * as util from 'util'
|
||||||
|
|
||||||
|
const readdir = util.promisify(fs.readdir)
|
||||||
|
|
||||||
export function tryGetFromToolCache(
|
export function tryGetFromToolCache(
|
||||||
arch: Architecture,
|
arch: Architecture,
|
||||||
version: string
|
version: string
|
||||||
@ -43,5 +48,10 @@ export async function downloadVersion(
|
|||||||
} else {
|
} else {
|
||||||
extractedDir = await tc.extractTar(downloadPath)
|
extractedDir = await tc.extractTar(downloadPath)
|
||||||
}
|
}
|
||||||
|
core.info(`Extracted uv to "${extractedDir}"`)
|
||||||
|
// list the contents of extracted dir
|
||||||
|
const files = await readdir(extractedDir)
|
||||||
|
core.info(`Contents of extracted directory: ${files.join(', ')}`)
|
||||||
|
|
||||||
return await tc.cacheDir(extractedDir, TOOL_CACHE_NAME, version, arch)
|
return await tc.cacheDir(extractedDir, TOOL_CACHE_NAME, version, arch)
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user