renovate/renovate
1
0
Fork 0
mirror of https://github.com/renovatebot/renovate.git synced 2025-01-13 15:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

test: fix java skipping (#15232)

Browse source
This commit is contained in:
Michael Kriese 2022-04-21 16:59:49 +02:00 committed by GitHub
parent 8267e77a64
commit d9bbc18155
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/modules/manager/gradle/__testutil__/gradle.ts
View file

@ -10,16 +10,11 @@ const gradleJavaVersionSupport = {
const skipJava = process.env.SKIP_JAVA_TESTS === 'true';
const enforceJava = process.env[failIfNoJavaEnv] === 'true' && !skipJava;
function parseJavaVersion(
javaVersionOutput: string | undefined
): number | null {
if (!javaVersionOutput) {
return null;
}
function parseJavaVersion(javaVersionOutput: string | undefined): number {
const versionMatch = /version "(?:1\.)?(\d+)[\d._-]*"/.exec(
javaVersionOutput
javaVersionOutput ?? ''
);
if (versionMatch !== null && versionMatch.length === 2) {
if (versionMatch?.length === 2) {
return parseInt(versionMatch[1], 10);
}
if (enforceJava) {
@ -30,10 +25,10 @@ ${javaVersionOutput}`);
return 0;
}
let cachedJavaVersion: number | null | undefined = undefined;
let cachedJavaVersion: number | null = null;
function determineJavaVersion(): number | null {
if (cachedJavaVersion === undefined) {
function determineJavaVersion(): number {
if (cachedJavaVersion === null) {
let javaVersionCommand: SpawnSyncReturns<string> | undefined;
let error: Error | undefined;
try {
@ -67,9 +62,6 @@ class WithGradle {
constructor(gradleVersion: keyof typeof gradleJavaVersionSupport) {
const javaVersion = determineJavaVersion();
if (!javaVersion) {
throw Error(`Unknown java version!`);
}
if (gradleJavaVersionSupport[gradleVersion] === undefined) {
throw Error(`Unknown gradle version '${gradleVersion}'!`);
}