mirror of
https://github.com/actions/setup-java.git
synced 2025-04-18 00:46:45 +00:00
patch to extract file from other location
This commit is contained in:
parent
5896cecc08
commit
a847c75719
3 changed files with 17 additions and 0 deletions
5
dist/cleanup/index.js
vendored
5
dist/cleanup/index.js
vendored
|
@ -88355,6 +88355,11 @@ exports.isCacheFeatureAvailable = isCacheFeatureAvailable;
|
|||
function getVersionFromFileContent(content, distributionName, versionFile) {
|
||||
var _a, _b, _c, _d, _e;
|
||||
let javaVersionRegExp;
|
||||
const path = __nccwpck_require__(1017);
|
||||
function getFileName(versionFile) {
|
||||
return path.basename(versionFile);
|
||||
}
|
||||
const versionFileName = getFileName(versionFile);
|
||||
if (versionFile == '.tool-versions') {
|
||||
javaVersionRegExp =
|
||||
/^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
|
||||
|
|
5
dist/setup/index.js
vendored
5
dist/setup/index.js
vendored
|
@ -125729,6 +125729,11 @@ exports.isCacheFeatureAvailable = isCacheFeatureAvailable;
|
|||
function getVersionFromFileContent(content, distributionName, versionFile) {
|
||||
var _a, _b, _c, _d, _e;
|
||||
let javaVersionRegExp;
|
||||
const path = __nccwpck_require__(71017);
|
||||
function getFileName(versionFile) {
|
||||
return path.basename(versionFile);
|
||||
}
|
||||
const versionFileName = getFileName(versionFile);
|
||||
if (versionFile == '.tool-versions') {
|
||||
javaVersionRegExp =
|
||||
/^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
|
||||
|
|
|
@ -119,6 +119,13 @@ export function getVersionFromFileContent(
|
|||
versionFile: string
|
||||
): string | null {
|
||||
let javaVersionRegExp: RegExp;
|
||||
const path = require('path');
|
||||
|
||||
function getFileName(versionFile: string) {
|
||||
return path.basename(versionFile);
|
||||
}
|
||||
|
||||
const versionFileName = getFileName(versionFile);
|
||||
if (versionFile == '.tool-versions') {
|
||||
javaVersionRegExp =
|
||||
/^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue