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

Remove console logs and debug version

Browse source
This commit is contained in:
panticmilos 2022-07-18 18:16:11 +02:00
parent f22ce50675
commit 6e46140c9c
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dist/setup/index.js vendored
View file

@ -64433,13 +64433,11 @@ class PipCache extends cache_distributor_1.default {
let primaryKey = ''; let primaryKey = '';
let restoreKey = ''; let restoreKey = '';
if (utils_1.IS_LINUX) { if (utils_1.IS_LINUX) {
console.log('here');
const osRelease = yield utils_1.getLinuxOSReleaseInfo(); const osRelease = yield utils_1.getLinuxOSReleaseInfo();
primaryKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${osRelease}-python-${this.pythonVersion}-${this.packageManager}-${hash}`; primaryKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${osRelease}-python-${this.pythonVersion}-${this.packageManager}-${hash}`;
restoreKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${osRelease}-python-${this.pythonVersion}-${this.packageManager}`; restoreKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${osRelease}-python-${this.pythonVersion}-${this.packageManager}`;
} }
else { else {
console.log('here2');
primaryKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-python-${this.pythonVersion}-${this.packageManager}-${hash}`; primaryKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-python-${this.pythonVersion}-${this.packageManager}-${hash}`;
restoreKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-python-${this.pythonVersion}-${this.packageManager}`; restoreKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-python-${this.pythonVersion}-${this.packageManager}`;
} }
@ -65486,19 +65484,18 @@ function isCacheFeatureAvailable() {
exports.isCacheFeatureAvailable = isCacheFeatureAvailable; exports.isCacheFeatureAvailable = isCacheFeatureAvailable;
function getLinuxOSReleaseInfo() { function getLinuxOSReleaseInfo() {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
const versionId = yield exec.getExecOutput('lsb_release', ['-a'], { const { stdout, stderr, exitCode } = yield exec.getExecOutput('lsb_release', ['-a'], {
silent: true silent: true
}); });
let osVersion = ''; let osVersion = '';
let osRelease = ''; let osRelease = '';
versionId.stdout.split('\n').forEach(elem => { stdout.split('\n').forEach(elem => {
if (elem.includes('Distributor')) if (elem.includes('Distributor'))
osVersion = elem.split(':')[1].trim(); osVersion = elem.split(':')[1].trim();
if (elem.includes('Release')) if (elem.includes('Release'))
osRelease = elem.split(':')[1].trim(); osRelease = elem.split(':')[1].trim();
}); });
core.info(osRelease); core.debug(`OS Release: ${osRelease}, Version: ${osVersion}`);
core.info(osVersion);
return `${osVersion}-${osRelease}`; return `${osVersion}-${osRelease}`;
}); });
} }

2
src/cache-distributions/pip-cache.ts
View file

@ -61,12 +61,10 @@ class PipCache extends CacheDistributor {
let restoreKey = ''; let restoreKey = '';
if (IS_LINUX) { if (IS_LINUX) {
console.log('here');
const osRelease = await getLinuxOSReleaseInfo(); const osRelease = await getLinuxOSReleaseInfo();
primaryKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${osRelease}-python-${this.pythonVersion}-${this.packageManager}-${hash}`; primaryKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${osRelease}-python-${this.pythonVersion}-${this.packageManager}-${hash}`;
restoreKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${osRelease}-python-${this.pythonVersion}-${this.packageManager}`; restoreKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${osRelease}-python-${this.pythonVersion}-${this.packageManager}`;
} else { } else {
console.log('here2');
primaryKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-python-${this.pythonVersion}-${this.packageManager}-${hash}`; primaryKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-python-${this.pythonVersion}-${this.packageManager}-${hash}`;
restoreKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-python-${this.pythonVersion}-${this.packageManager}`; restoreKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-python-${this.pythonVersion}-${this.packageManager}`;
} }

15
src/utils.ts
View file

@ -122,18 +122,23 @@ export function isCacheFeatureAvailable(): boolean {
} }
export async function getLinuxOSReleaseInfo() { export async function getLinuxOSReleaseInfo() {
const versionId = await exec.getExecOutput('lsb_release', ['-a'], { const {stdout, stderr, exitCode} = await exec.getExecOutput(
'lsb_release',
['-a'],
{
silent: true silent: true
}); }
);
let osVersion = ''; let osVersion = '';
let osRelease = ''; let osRelease = '';
versionId.stdout.split('\n').forEach(elem => { stdout.split('\n').forEach(elem => {
if (elem.includes('Distributor')) osVersion = elem.split(':')[1].trim(); if (elem.includes('Distributor')) osVersion = elem.split(':')[1].trim();
if (elem.includes('Release')) osRelease = elem.split(':')[1].trim(); if (elem.includes('Release')) osRelease = elem.split(':')[1].trim();
}); });
core.info(osRelease); core.debug(`OS Release: ${osRelease}, Version: ${osVersion}`);
core.info(osVersion);
return `${osVersion}-${osRelease}`; return `${osVersion}-${osRelease}`;
} }