actions/setup-java
5
0
Fork 0
mirror of https://gitea.com/actions/setup-java.git synced 2026-08-05 02:31:18 +00:00
Code Activity

Apply batched suggestions from code review

Browse Source 
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
Bruno Borges
2026-08-04 19:33:29 -04:00
committed by GitHub
parent ee3e6d82d3
commit 7091818a1e
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/distributions/base-installer.ts
+10 -5
View File
@@ -324,18 +324,23 @@ export abstract class JavaBase {
} }
protected getJdkCachePath(version: string): string { protected getJdkCachePath(version: string): string {
const toolCache = process.env['RUNNER_TOOL_CACHE'];
if (!toolCache) {
return '';
}
return path.join( return path.join(
process.env['RUNNER_TOOL_CACHE'] ?? '', toolCache,
this.toolcacheFolderName, this.toolcacheFolderName,
this.getToolcacheVersionName(version) this.getToolcacheVersionName(version)
); );
} }
protected getRestoredJdkPath(version: string): string | null { protected getRestoredJdkPath(version: string): string | null {
const architecturePath = path.join( const basePath = this.getJdkCachePath(version);
this.getJdkCachePath(version), if (!basePath) {
this.architecture return null;
); }
const architecturePath = path.join(basePath, this.architecture);
return fs.existsSync(architecturePath) && return fs.existsSync(architecturePath) &&
fs.existsSync(`${architecturePath}.complete`) fs.existsSync(`${architecturePath}.complete`)
? architecturePath ? architecturePath
src/jdk-cache.ts
+5 -3
View File
@@ -99,18 +99,20 @@ export async function saveJdkCaches(): Promise<void> {
} }
export function buildJdkCacheKey(jdk: JdkCache): string { export function buildJdkCacheKey(jdk: JdkCache): string {
const runnerOs = process.env['RUNNER_OS'] ?? process.platform;
const normalizedArchitecture = jdk.architecture.toLowerCase();
const identity = JSON.stringify({ const identity = JSON.stringify({
keyVersion: JDK_CACHE_KEY_VERSION, keyVersion: JDK_CACHE_KEY_VERSION,
runnerOs: process.env['RUNNER_OS'] ?? process.platform, runnerOs,
platform: process.platform, platform: process.platform,
distribution: jdk.distribution.toLowerCase(), distribution: jdk.distribution.toLowerCase(),
packageType: jdk.packageType.toLowerCase(), packageType: jdk.packageType.toLowerCase(),
architecture: jdk.architecture.toLowerCase(), architecture: normalizedArchitecture,
version: jdk.version, version: jdk.version,
source: jdk.source source: jdk.source
}); });
const digest = createHash('sha256').update(identity).digest('hex'); const digest = createHash('sha256').update(identity).digest('hex');
return `setup-java-jdk-v${JDK_CACHE_KEY_VERSION}-${process.env['RUNNER_OS'] ?? process.platform}-${jdk.architecture}-${digest}`; return `setup-java-jdk-v${JDK_CACHE_KEY_VERSION}-${runnerOs}-${normalizedArchitecture}-${digest}`;
} }
function parseJdkCacheState(state: string): JdkCacheState[] { function parseJdkCacheState(state: string): JdkCacheState[] {