lint and build

Signed-off-by: Anton Troshin <anton@diagrid.io>
This commit is contained in:
Anton Troshin 2024-11-19 12:09:58 -06:00
parent 0dc6404f6a
commit 6cd0eaadd6
No known key found for this signature in database
GPG key ID: 9F8A96ACA9EB6363
2 changed files with 15 additions and 5 deletions

14
dist/setup/index.js vendored
View file

@ -88395,18 +88395,28 @@ function cacheWindowsDir(extPath, tool, version, arch) {
const actualCacheDirectoryPaths = cacheDirectoryPaths.map(path => { const actualCacheDirectoryPaths = cacheDirectoryPaths.map(path => {
return { return {
defaultPath: path, defaultPath: path,
actualPath: path.replace('D:', 'C:').replace('d:', 'c:') actualPath: path.replace('C:', 'D:').replace('c:', 'd:')
}; };
}); });
// iterate through actual cache directory paths and make links // iterate through actual cache directory paths and make links if necessary
for (const cachePath of actualCacheDirectoryPaths) { for (const cachePath of actualCacheDirectoryPaths) {
if (!fs_1.default.existsSync(cachePath.actualPath)) { if (!fs_1.default.existsSync(cachePath.actualPath)) {
core.info(`Creating directory ${cachePath.actualPath}`); core.info(`Creating directory ${cachePath.actualPath}`);
fs_1.default.mkdirSync(path.dirname(cachePath.actualPath), { recursive: true }); fs_1.default.mkdirSync(path.dirname(cachePath.actualPath), { recursive: true });
} }
else {
core.info(`Directory ${cachePath.actualPath} already exists`);
// make sure the link is pointing to the actual cache directory
const symlinkTarget = fs_1.default.readlinkSync(cachePath.defaultPath);
if (symlinkTarget !== "") {
core.info(`Found link ${cachePath.defaultPath} => ${symlinkTarget}`);
}
else {
fs_1.default.symlinkSync(cachePath.actualPath, cachePath.defaultPath, 'junction'); fs_1.default.symlinkSync(cachePath.actualPath, cachePath.defaultPath, 'junction');
core.info(`Created link ${cachePath.defaultPath} => ${cachePath.actualPath}`); core.info(`Created link ${cachePath.defaultPath} => ${cachePath.actualPath}`);
} }
}
}
// make outer code to continue using toolcache as if it were installed on c: // make outer code to continue using toolcache as if it were installed on c:
// restore toolcache root to default drive c: // restore toolcache root to default drive c:
process.env['RUNNER_TOOL_CACHE'] = defaultToolCacheRoot; process.env['RUNNER_TOOL_CACHE'] = defaultToolCacheRoot;

View file

@ -240,7 +240,7 @@ async function cacheWindowsDir(
} else { } else {
core.info(`Directory ${cachePath.actualPath} already exists`); core.info(`Directory ${cachePath.actualPath} already exists`);
// make sure the link is pointing to the actual cache directory // make sure the link is pointing to the actual cache directory
let symlinkTarget = fs.readlinkSync(cachePath.defaultPath); const symlinkTarget = fs.readlinkSync(cachePath.defaultPath);
if (symlinkTarget !== "") { if (symlinkTarget !== "") {
core.info(`Found link ${cachePath.defaultPath} => ${symlinkTarget}`); core.info(`Found link ${cachePath.defaultPath} => ${symlinkTarget}`);
} else { } else {