mirror/setup-python
1
0
Fork 0
mirror of https://github.com/actions/setup-python.git synced 2026-01-19 19:38:56 +08:00
Code Issues Projects Releases Packages Wiki Activity

resolve throw error

Browse source
This commit is contained in:
Dmitry Shibanov 2020-12-15 20:36:35 +03:00
parent 3d613a97df
commit ef9020329d
4 changed files with 29 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/find-pypy.ts
View file

@ -1,6 +1,6 @@
import * as path from 'path';
import * as pypyInstall from './install-pypy';
import {IS_WINDOWS, validateVersion} from './utils';
import {IS_WINDOWS, validateVersion, getPyPyVersionFromPath} from './utils';
import * as semver from 'semver';
import * as core from '@actions/core';
@ -54,7 +54,7 @@ export async function findPyPyVersion(
return {resolvedPyPyVersion, resolvedPythonVersion};
}
function findPyPyToolCache(
export function findPyPyToolCache(
pythonVersion: string,
pypyVersion: string,
architecture: string
@ -89,14 +89,13 @@ function findPyPyToolCache(
return {installDir, resolvedPythonVersion, resolvedPyPyVersion};
}
function parsePyPyVersion(versionSpec: string): IPyPyVersionSpec {
export function parsePyPyVersion(versionSpec: string): IPyPyVersionSpec {
const versions = versionSpec.split('-').filter(item => !!item);
if (versions.length < 2) {
core.setFailed(
if (versions.length < 2 || versions[0] != 'pypy') {
throw new Error(
"Invalid 'version' property for PyPy. PyPy version should be specified as 'pypy-<python-version>'. See README for examples and documentation."
);
process.exit();
}
const pythonVersion = versions[1];
@ -108,10 +107,9 @@ function parsePyPyVersion(versionSpec: string): IPyPyVersionSpec {
}
if (!validateVersion(pythonVersion) || !validateVersion(pypyVersion)) {
core.setFailed(
throw new Error(
"Invalid 'version' property for PyPy. Both Python version and PyPy versions should satisfy SemVer notation. See README for examples and documentation."
);
process.exit();
}
return {
@ -119,7 +117,3 @@ function parsePyPyVersion(versionSpec: string): IPyPyVersionSpec {
pythonVersion: pythonVersion
};
}
function getPyPyVersionFromPath(installDir: string) {
return path.basename(path.dirname(installDir));
}