Signed-off-by: Anton Troshin <anton@diagrid.io>
This commit is contained in:
Anton Troshin 2024-11-19 13:05:53 -06:00
parent fd3fcb34ee
commit 896e2cbf0f
No known key found for this signature in database
GPG key ID: 9F8A96ACA9EB6363
2 changed files with 13 additions and 9 deletions

4
dist/setup/index.js vendored
View file

@ -88400,14 +88400,17 @@ function cacheWindowsDir(extPath, tool, version, arch) {
}); });
// iterate through actual cache directory paths and make links if necessary // iterate through actual cache directory paths and make links if necessary
for (const cachePath of actualCacheDirectoryPaths) { for (const cachePath of actualCacheDirectoryPaths) {
core.info(`Trying to link ${cachePath.defaultPath} to ${cachePath.actualPath}`);
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 { 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
const symlinkTarget = fs_1.default.readlinkSync(cachePath.defaultPath); const symlinkTarget = fs_1.default.readlinkSync(cachePath.defaultPath);
core.info(`Symlink target: ${symlinkTarget}`);
if (symlinkTarget !== "") { if (symlinkTarget !== "") {
core.info(`Found link ${cachePath.defaultPath} => ${symlinkTarget}`); core.info(`Found link ${cachePath.defaultPath} => ${symlinkTarget}`);
} }
@ -88416,7 +88419,6 @@ function cacheWindowsDir(extPath, tool, version, arch) {
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

@ -234,6 +234,7 @@ async function cacheWindowsDir(
// iterate through actual cache directory paths and make links if necessary // iterate through actual cache directory paths and make links if necessary
for (const cachePath of actualCacheDirectoryPaths) { for (const cachePath of actualCacheDirectoryPaths) {
core.info(`Trying to link ${cachePath.defaultPath} to ${cachePath.actualPath}`);
if (!fs.existsSync(cachePath.actualPath)) { if (!fs.existsSync(cachePath.actualPath)) {
core.info(`Creating directory ${cachePath.actualPath}`); core.info(`Creating directory ${cachePath.actualPath}`);
fs.mkdirSync(path.dirname(cachePath.actualPath), {recursive: true}); fs.mkdirSync(path.dirname(cachePath.actualPath), {recursive: true});
@ -242,6 +243,7 @@ async function cacheWindowsDir(
} }
// make sure the link is pointing to the actual cache directory // make sure the link is pointing to the actual cache directory
const symlinkTarget = fs.readlinkSync(cachePath.defaultPath); const symlinkTarget = fs.readlinkSync(cachePath.defaultPath);
core.info(`Symlink target: ${symlinkTarget}`);
if (symlinkTarget !== "") { if (symlinkTarget !== "") {
core.info(`Found link ${cachePath.defaultPath} => ${symlinkTarget}`); core.info(`Found link ${cachePath.defaultPath} => ${symlinkTarget}`);
} else { } else {