actions/setup-python
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update exec command, remove mock from unit tests

Browse source
This commit is contained in:
panticmilos 2022-07-18 18:24:59 +02:00
parent 6e46140c9c
commit 96d176662d
3 changed files with 4 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
__tests__/cache-restore.test.ts
View file

@ -114,12 +114,6 @@ virtualenvs.path = "{cache-dir}/virtualenvs" # /Users/patrick/Library/Caches/py
dependencyFile dependencyFile
); );
if (process.platform === 'linux') {
getLinuxOSReleaseInfoSpy.mockImplementation(() =>
Promise.resolve('Ubuntu-20.4')
);
}
await cacheDistributor.restoreCache(); await cacheDistributor.restoreCache();
if (process.platform === 'linux') { if (process.platform === 'linux') {

11
dist/setup/index.js vendored
View file

@ -65484,17 +65484,10 @@ 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 { stdout, stderr, exitCode } = yield exec.getExecOutput('lsb_release', ['-a'], { const { stdout, stderr, exitCode } = yield exec.getExecOutput('lsb_release', ['-i -r -s'], {
silent: true silent: true
}); });
let osVersion = ''; const [osRelease, osVersion] = stdout.trim().split('\n');
let osRelease = '';
stdout.split('\n').forEach(elem => {
if (elem.includes('Distributor'))
osVersion = elem.split(':')[1].trim();
if (elem.includes('Release'))
osRelease = elem.split(':')[1].trim();
});
core.debug(`OS Release: ${osRelease}, Version: ${osVersion}`); core.debug(`OS Release: ${osRelease}, Version: ${osVersion}`);
return `${osVersion}-${osRelease}`; return `${osVersion}-${osRelease}`;
}); });

10
src/utils.ts
View file

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