mirror of
https://github.com/actions/setup-java.git
synced 2026-06-23 09:48:21 +01:00
refactor: address review feedback on Community resolver
This commit is contained in:
committed by
GitHub
parent
651865a8a8
commit
05917d5627
9
dist/setup/index.js
vendored
9
dist/setup/index.js
vendored
@@ -79087,6 +79087,7 @@ const GRAALVM_COMMUNITY_RELEASES_URL = 'https://api.github.com/repos/graalvm/gra
|
|||||||
const GRAALVM_COMMUNITY_RELEASES_PAGE_ORIGIN = 'https://api.github.com';
|
const GRAALVM_COMMUNITY_RELEASES_PAGE_ORIGIN = 'https://api.github.com';
|
||||||
const GRAALVM_COMMUNITY_DOWNLOAD_URL = 'https://github.com/graalvm/graalvm-ce-builds/releases';
|
const GRAALVM_COMMUNITY_DOWNLOAD_URL = 'https://github.com/graalvm/graalvm-ce-builds/releases';
|
||||||
const GRAALVM_COMMUNITY_ASSET_PREFIX = 'graalvm-community-jdk-';
|
const GRAALVM_COMMUNITY_ASSET_PREFIX = 'graalvm-community-jdk-';
|
||||||
|
const GRAALVM_COMMUNITY_VERSION_PATTERN = /^\d+(?:\.\d+)*$/;
|
||||||
const IS_WINDOWS = process.platform === 'win32';
|
const IS_WINDOWS = process.platform === 'win32';
|
||||||
const GRAALVM_PLATFORM = IS_WINDOWS ? 'windows' : process.platform;
|
const GRAALVM_PLATFORM = IS_WINDOWS ? 'windows' : process.platform;
|
||||||
const GRAALVM_MIN_VERSION = 17;
|
const GRAALVM_MIN_VERSION = 17;
|
||||||
@@ -79292,14 +79293,14 @@ class GraalVMCommunityDistribution extends GraalVMDistribution {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
getAvailableVersions(assetSuffix) {
|
getAvailableVersions(assetSuffix) {
|
||||||
var _a, _b;
|
var _a;
|
||||||
return __awaiter(this, void 0, void 0, function* () {
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
const headers = (0, util_1.getGitHubHttpHeaders)();
|
const headers = (0, util_1.getGitHubHttpHeaders)();
|
||||||
const versions = new Map();
|
const versions = new Map();
|
||||||
let releasesUrl = GRAALVM_COMMUNITY_RELEASES_URL;
|
let releasesUrl = GRAALVM_COMMUNITY_RELEASES_URL;
|
||||||
for (let page = 0; releasesUrl && page < util_1.MAX_PAGINATION_PAGES; page++) {
|
for (let page = 0; releasesUrl && page < util_1.MAX_PAGINATION_PAGES; page++) {
|
||||||
const response = yield this.http.getJson(releasesUrl, headers);
|
const response = yield this.http.getJson(releasesUrl, headers);
|
||||||
const releases = (_a = response.result) !== null && _a !== void 0 ? _a : [];
|
const releases = Array.isArray(response.result) ? response.result : [];
|
||||||
if (releases.length === 0) {
|
if (releases.length === 0) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -79307,7 +79308,7 @@ class GraalVMCommunityDistribution extends GraalVMDistribution {
|
|||||||
if (release.draft || release.prerelease) {
|
if (release.draft || release.prerelease) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
for (const asset of (_b = release.assets) !== null && _b !== void 0 ? _b : []) {
|
for (const asset of (_a = release.assets) !== null && _a !== void 0 ? _a : []) {
|
||||||
const version = this.extractAssetVersion(asset.name, assetSuffix);
|
const version = this.extractAssetVersion(asset.name, assetSuffix);
|
||||||
if (version) {
|
if (version) {
|
||||||
versions.set(version, {
|
versions.set(version, {
|
||||||
@@ -79330,7 +79331,7 @@ class GraalVMCommunityDistribution extends GraalVMDistribution {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
const rawVersion = assetName.slice(GRAALVM_COMMUNITY_ASSET_PREFIX.length, -assetSuffix.length);
|
const rawVersion = assetName.slice(GRAALVM_COMMUNITY_ASSET_PREFIX.length, -assetSuffix.length);
|
||||||
if (!/^\d+(?:\.\d+)*$/.test(rawVersion)) {
|
if (!GRAALVM_COMMUNITY_VERSION_PATTERN.test(rawVersion)) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
return (0, util_1.convertVersionToSemver)(rawVersion);
|
return (0, util_1.convertVersionToSemver)(rawVersion);
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ const GRAALVM_COMMUNITY_RELEASES_PAGE_ORIGIN = 'https://api.github.com';
|
|||||||
const GRAALVM_COMMUNITY_DOWNLOAD_URL =
|
const GRAALVM_COMMUNITY_DOWNLOAD_URL =
|
||||||
'https://github.com/graalvm/graalvm-ce-builds/releases';
|
'https://github.com/graalvm/graalvm-ce-builds/releases';
|
||||||
const GRAALVM_COMMUNITY_ASSET_PREFIX = 'graalvm-community-jdk-';
|
const GRAALVM_COMMUNITY_ASSET_PREFIX = 'graalvm-community-jdk-';
|
||||||
|
const GRAALVM_COMMUNITY_VERSION_PATTERN = /^\d+(?:\.\d+)*$/;
|
||||||
const IS_WINDOWS = process.platform === 'win32';
|
const IS_WINDOWS = process.platform === 'win32';
|
||||||
const GRAALVM_PLATFORM = IS_WINDOWS ? 'windows' : process.platform;
|
const GRAALVM_PLATFORM = IS_WINDOWS ? 'windows' : process.platform;
|
||||||
const GRAALVM_MIN_VERSION = 17;
|
const GRAALVM_MIN_VERSION = 17;
|
||||||
@@ -386,7 +387,7 @@ export class GraalVMCommunityDistribution extends GraalVMDistribution {
|
|||||||
headers
|
headers
|
||||||
);
|
);
|
||||||
|
|
||||||
const releases = response.result ?? [];
|
const releases = Array.isArray(response.result) ? response.result : [];
|
||||||
if (releases.length === 0) {
|
if (releases.length === 0) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -431,7 +432,7 @@ export class GraalVMCommunityDistribution extends GraalVMDistribution {
|
|||||||
-assetSuffix.length
|
-assetSuffix.length
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!/^\d+(?:\.\d+)*$/.test(rawVersion)) {
|
if (!GRAALVM_COMMUNITY_VERSION_PATTERN.test(rawVersion)) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user