actions/setup-python
1
0
Fork 0
mirror of https://github.com/actions/setup-python.git synced 2025-04-24 15:32:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

minor changes

Browse source
This commit is contained in:
Dmitry Shibanov 2021-09-15 00:14:44 +03:00
parent e8afe8a475
commit 5fe7a0b444
3 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dist/cache-save/index.js vendored
View file

@ -35052,7 +35052,12 @@ class CacheDistributor {
if (stderr) { if (stderr) {
throw new Error(`failed to procceed with caching with error: ${exitCode}`); throw new Error(`failed to procceed with caching with error: ${exitCode}`);
} }
return [stdout]; let resolvedPath = stdout;
if (stdout.includes('~')) {
resolvedPath = path.join(os.homedir(), stdout.slice(1));
}
core.info(`global cache directory path is ${resolvedPath}`);
return [resolvedPath];
}); });
} }
computePrimaryKey() { computePrimaryKey() {
@ -35063,10 +35068,7 @@ class CacheDistributor {
} }
isCacheDirectoryExists(cacheDirectory) { isCacheDirectoryExists(cacheDirectory) {
const result = cacheDirectory.reduce((previousValue, currentValue) => { const result = cacheDirectory.reduce((previousValue, currentValue) => {
const resolvePath = currentValue.includes('~') return previousValue || fs.existsSync(currentValue);
? path.join(os.homedir(), currentValue.slice(1))
: currentValue;
return previousValue || fs.existsSync(resolvePath);
}, false); }, false);
return result; return result;
} }

12
dist/setup/index.js vendored
View file

@ -36821,7 +36821,12 @@ class CacheDistributor {
if (stderr) { if (stderr) {
throw new Error(`failed to procceed with caching with error: ${exitCode}`); throw new Error(`failed to procceed with caching with error: ${exitCode}`);
} }
return [stdout]; let resolvedPath = stdout;
if (stdout.includes('~')) {
resolvedPath = path.join(os.homedir(), stdout.slice(1));
}
core.info(`global cache directory path is ${resolvedPath}`);
return [resolvedPath];
}); });
} }
computePrimaryKey() { computePrimaryKey() {
@ -36832,10 +36837,7 @@ class CacheDistributor {
} }
isCacheDirectoryExists(cacheDirectory) { isCacheDirectoryExists(cacheDirectory) {
const result = cacheDirectory.reduce((previousValue, currentValue) => { const result = cacheDirectory.reduce((previousValue, currentValue) => {
const resolvePath = currentValue.includes('~') return previousValue || fs.existsSync(currentValue);
? path.join(os.homedir(), currentValue.slice(1))
: currentValue;
return previousValue || fs.existsSync(resolvePath);
}, false); }, false);
return result; return result;
} }

15
src/cache-distributions/cache-distributor.ts
View file

@ -29,7 +29,15 @@ abstract class CacheDistributor {
); );
} }
return [stdout]; let resolvedPath = stdout;
if (stdout.includes('~')) {
resolvedPath = path.join(os.homedir(), stdout.slice(1));
}
core.info(`global cache directory path is ${resolvedPath}`);
return [resolvedPath];
} }
protected async computePrimaryKey() { protected async computePrimaryKey() {
@ -39,10 +47,7 @@ abstract class CacheDistributor {
protected isCacheDirectoryExists(cacheDirectory: string[]) { protected isCacheDirectoryExists(cacheDirectory: string[]) {
const result = cacheDirectory.reduce((previousValue, currentValue) => { const result = cacheDirectory.reduce((previousValue, currentValue) => {
const resolvePath = currentValue.includes('~') return previousValue || fs.existsSync(currentValue);
? path.join(os.homedir(), currentValue.slice(1))
: currentValue;
return previousValue || fs.existsSync(resolvePath);
}, false); }, false);
return result; return result;