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

Move the extracted JDK into the tool-cache and speed up extraction (#1206)

Browse Source 
Two wall-clock optimizations on the JDK install path.

`tc.cacheDir` recursively copies the extracted tree into RUNNER_TOOL_CACHE,
so a 200-600MB JDK is written to disk twice. The extraction directory and
the tool-cache normally share a filesystem, so `cacheJdkDir` renames it
instead and writes the `.complete` marker itself, mirroring the destination
layout `tc.cacheDir` produces. It falls back to the copy when the tool-cache
location is unknown, when the source is not a real directory (a symlinked
source would otherwise leave a dangling entry once RUNNER_TEMP is cleaned),
or when the rename fails - a cross-device tool-cache, or anti-virus holding
a handle on Windows. The rename is atomic, so the source is still intact
for the fallback.

Extraction now uses `pigz` for tarballs when the runner provides it, and
Windows zips go through the bundled `tar.exe` rather than `tc.extractZip`,
which shells out to PowerShell's much slower `Expand-Archive`. Both fall
back to the stock extraction and clean up the abandoned directory first.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: b76d8cb0-f629-46e1-bf9a-ffde06948644
This commit is contained in:
Bruno Borges
2026-08-04 23:05:06 -04:00
committed by GitHub
parent 2924169ccc
commit 885218c5e4
34 changed files with 1041 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/distributions/corretto/installer.ts
+2 -2
View File
@@ -1,8 +1,8 @@
import * as core from '@actions/core';
import * as tc from '@actions/tool-cache';
import fs from 'fs';
import path from 'path';
import {
cacheJdkDir,
extractJdkFile,
getDownloadArchiveExtension,
convertVersionToSemver,
@@ -46,7 +46,7 @@ export class CorrettoDistribution extends JavaBase {
const archivePath = path.join(extractedJavaPath, archiveName);
const version = this.getToolcacheVersionName(javaRelease.version);
const javaPath = await tc.cacheDir(
const javaPath = await cacheJdkDir(
archivePath,
this.toolcacheFolderName,
version,
src/distributions/dragonwell/installer.ts
+2 -2
View File
@@ -1,5 +1,4 @@
import * as core from '@actions/core';
import * as tc from '@actions/tool-cache';
import semver from 'semver';
import fs from 'fs';
@@ -7,6 +6,7 @@ import path from 'path';
import {JavaBase} from '../base-installer.js';
import {
cacheJdkDir,
convertVersionToSemver,
extractJdkFile,
getDownloadArchiveExtension,
@@ -121,7 +121,7 @@ export class DragonwellDistribution extends JavaBase {
const archivePath = path.join(extractedJavaPath, archiveName);
const version = this.getToolcacheVersionName(javaRelease.version);
const javaPath = await tc.cacheDir(
const javaPath = await cacheJdkDir(
archivePath,
this.toolcacheFolderName,
version,
src/distributions/graalvm/installer.ts
+2 -2
View File
@@ -1,5 +1,4 @@
import * as core from '@actions/core';
import * as tc from '@actions/tool-cache';
import fs from 'fs';
import path from 'path';
import semver from 'semver';
@@ -12,6 +11,7 @@ import {
JavaInstallerResults
} from '../base-models.js';
import {
cacheJdkDir,
convertVersionToSemver,
extractJdkFile,
getDownloadArchiveExtension,
@@ -97,7 +97,7 @@ export class GraalVMDistribution extends JavaBase {
const archivePath = path.join(extractedJavaPath, dirContents[0]);
const version = this.getToolcacheVersionName(javaRelease.version);
const javaPath = await tc.cacheDir(
const javaPath = await cacheJdkDir(
archivePath,
this.toolcacheFolderName,
version,
src/distributions/jetbrains/installer.ts
+2 -3
View File
@@ -1,5 +1,4 @@
import * as core from '@actions/core';
import * as tc from '@actions/tool-cache';
import fs from 'fs';
import path from 'path';
@@ -12,7 +11,7 @@ import {
JavaInstallerOptions,
JavaInstallerResults
} from '../base-models.js';
import {extractJdkFile, isVersionSatisfies} from '../../util.js';
import {cacheJdkDir, extractJdkFile, isVersionSatisfies} from '../../util.js';
import {OutgoingHttpHeaders} from 'http';
import {HttpCodes} from '@actions/http-client';
@@ -79,7 +78,7 @@ export class JetBrainsDistribution extends JavaBase {
const archivePath = path.join(extractedJavaPath, archiveName);
const version = this.getToolcacheVersionName(javaRelease.version);
const javaPath = await tc.cacheDir(
const javaPath = await cacheJdkDir(
archivePath,
this.toolcacheFolderName,
version,
src/distributions/kona/installer.ts
+2 -2
View File
@@ -1,5 +1,4 @@
import * as core from '@actions/core';
import * as tc from '@actions/tool-cache';
import semver from 'semver';
import fs from 'fs';
@@ -13,6 +12,7 @@ import {
JavaInstallerResults
} from '../base-models.js';
import {
cacheJdkDir,
extractJdkFile,
getDownloadArchiveExtension,
isVersionSatisfies,
@@ -48,7 +48,7 @@ export class KonaDistribution extends JavaBase {
const jdkDirectory = path.join(extractedJavaPath, archiveName);
const version = this.getToolcacheVersionName(javaRelease.version);
const javaPath = await tc.cacheDir(
const javaPath = await cacheJdkDir(
jdkDirectory,
this.toolcacheFolderName,
version,
src/distributions/liberica-nik/installer.ts
+2 -2
View File
@@ -6,6 +6,7 @@ import {
} from '../base-models.js';
import semver from 'semver';
import {
cacheJdkDir,
extractJdkFile,
getDownloadArchiveExtension,
isVersionSatisfies,
@@ -13,7 +14,6 @@ import {
} from '../../util.js';
import * as core from '@actions/core';
import {ArchitectureOptions, NikVersion, OsVersions} from './models.js';
import * as tc from '@actions/tool-cache';
import fs from 'fs';
import path from 'path';
@@ -44,7 +44,7 @@ export class LibericaNikDistributions extends JavaBase {
const archiveName = fs.readdirSync(extractedJavaPath)[0];
const archivePath = path.join(extractedJavaPath, archiveName);
const javaPath = await tc.cacheDir(
const javaPath = await cacheJdkDir(
archivePath,
this.toolcacheFolderName,
this.getToolcacheVersionName(javaRelease.version),
src/distributions/liberica/installer.ts
+2 -2
View File
@@ -6,6 +6,7 @@ import {
} from '../base-models.js';
import semver from 'semver';
import {
cacheJdkDir,
extractJdkFile,
getDownloadArchiveExtension,
isVersionSatisfies,
@@ -13,7 +14,6 @@ import {
} from '../../util.js';
import * as core from '@actions/core';
import {ArchitectureOptions, LibericaVersion, OsVersions} from './models.js';
import * as tc from '@actions/tool-cache';
import fs from 'fs';
import path from 'path';
@@ -44,7 +44,7 @@ export class LibericaDistributions extends JavaBase {
const archiveName = fs.readdirSync(extractedJavaPath)[0];
const archivePath = path.join(extractedJavaPath, archiveName);
const javaPath = await tc.cacheDir(
const javaPath = await cacheJdkDir(
archivePath,
this.toolcacheFolderName,
this.getToolcacheVersionName(javaRelease.version),
src/distributions/local/installer.ts
+2 -3
View File
@@ -1,4 +1,3 @@
import * as tc from '@actions/tool-cache';
import * as core from '@actions/core';
import fs from 'fs';
@@ -10,7 +9,7 @@ import {
JavaDownloadRelease,
JavaInstallerResults
} from '../base-models.js';
import {extractJdkFile} from '../../util.js';
import {cacheJdkDir, extractJdkFile} from '../../util.js';
import {MACOS_JAVA_CONTENT_POSTFIX} from '../../constants.js';
import {createReadStream} from 'fs';
import {createHash} from 'crypto';
@@ -92,7 +91,7 @@ export class LocalDistribution extends JavaBase {
const archivePath = path.join(extractedJavaPath, archiveName);
const javaVersion = this.version;
const javaPath = await tc.cacheDir(
const javaPath = await cacheJdkDir(
archivePath,
this.toolcacheFolderName,
this.getToolcacheVersionName(javaVersion),
src/distributions/microsoft/installer.ts
+2 -1
View File
@@ -5,6 +5,7 @@ import {
JavaInstallerResults
} from '../base-models.js';
import {
cacheJdkDir,
extractJdkFile,
getDownloadArchiveExtension,
getGitHubHttpHeaders,
@@ -64,7 +65,7 @@ export class MicrosoftDistributions extends JavaBase {
const archiveName = fs.readdirSync(extractedJavaPath)[0];
const archivePath = path.join(extractedJavaPath, archiveName);
const javaPath = await tc.cacheDir(
const javaPath = await cacheJdkDir(
archivePath,
this.toolcacheFolderName,
this.getToolcacheVersionName(javaRelease.version),
src/distributions/openjdk/installer.ts
+2 -2
View File
@@ -1,5 +1,4 @@
import * as core from '@actions/core';
import * as tc from '@actions/tool-cache';
import fs from 'fs';
import path from 'path';
import semver from 'semver';
@@ -11,6 +10,7 @@ import {
JavaInstallerResults
} from '../base-models.js';
import {
cacheJdkDir,
convertVersionToSemver,
extractJdkFile,
isVersionSatisfies,
@@ -74,7 +74,7 @@ export class OpenJdkDistribution extends JavaBase {
const archiveName = fs.readdirSync(extractedJavaPath)[0];
const archivePath = path.join(extractedJavaPath, archiveName);
const javaPath = await tc.cacheDir(
const javaPath = await cacheJdkDir(
archivePath,
this.toolcacheFolderName,
this.getToolcacheVersionName(javaRelease.version),
src/distributions/oracle/installer.ts
+2 -2
View File
@@ -1,5 +1,4 @@
import * as core from '@actions/core';
import * as tc from '@actions/tool-cache';
import fs from 'fs';
import path from 'path';
@@ -11,6 +10,7 @@ import {
JavaInstallerResults
} from '../base-models.js';
import {
cacheJdkDir,
extractJdkFile,
getDownloadArchiveExtension,
getLatestMajorVersion,
@@ -45,7 +45,7 @@ export class OracleDistribution extends JavaBase {
const archivePath = path.join(extractedJavaPath, archiveName);
const version = this.getToolcacheVersionName(javaRelease.version);
const javaPath = await tc.cacheDir(
const javaPath = await cacheJdkDir(
archivePath,
this.toolcacheFolderName,
version,
src/distributions/sapmachine/installer.ts
+2 -2
View File
@@ -1,10 +1,10 @@
import * as core from '@actions/core';
import * as tc from '@actions/tool-cache';
import semver from 'semver';
import fs from 'fs';
import {OutgoingHttpHeaders} from 'http';
import path from 'path';
import {
cacheJdkDir,
convertVersionToSemver,
extractJdkFile,
getDownloadArchiveExtension,
@@ -124,7 +124,7 @@ export class SapMachineDistribution extends JavaBase {
const archivePath = path.join(extractedJavaPath, archiveName);
const version = this.getToolcacheVersionName(javaRelease.version);
const javaPath = await tc.cacheDir(
const javaPath = await cacheJdkDir(
archivePath,
this.toolcacheFolderName,
version,
src/distributions/semeru/installer.ts
+2 -2
View File
@@ -6,6 +6,7 @@ import {
} from '../base-models.js';
import semver from 'semver';
import {
cacheJdkDir,
extractJdkFile,
getNextPageUrlFromLinkHeader,
getDownloadArchiveExtension,
@@ -15,7 +16,6 @@ import {
validatePaginationUrl
} from '../../util.js';
import * as core from '@actions/core';
import * as tc from '@actions/tool-cache';
import fs from 'fs';
import path from 'path';
import {ISemeruAvailableVersions} from './models.js';
@@ -125,7 +125,7 @@ export class SemeruDistribution extends JavaBase {
const archivePath = path.join(extractedJavaPath, archiveName);
const version = this.getToolcacheVersionName(javaRelease.version);
const javaPath: string = await tc.cacheDir(
const javaPath: string = await cacheJdkDir(
archivePath,
this.toolcacheFolderName,
version,
src/distributions/temurin/installer.ts
+2 -2
View File
@@ -1,5 +1,4 @@
import * as core from '@actions/core';
import * as tc from '@actions/tool-cache';
import fs from 'fs';
import path from 'path';
@@ -16,6 +15,7 @@ import {
JavaInstallerResults
} from '../base-models.js';
import {
cacheJdkDir,
extractJdkFile,
getNextPageUrlFromLinkHeader,
getDownloadArchiveExtension,
@@ -122,7 +122,7 @@ export class TemurinDistribution extends JavaBase {
}
const version = this.getToolcacheVersionName(javaRelease.version);
const javaPath = await tc.cacheDir(
const javaPath = await cacheJdkDir(
archivePath,
this.toolcacheFolderName,
version,
src/distributions/zulu/installer.ts
+2 -2
View File
@@ -1,5 +1,4 @@
import * as core from '@actions/core';
import * as tc from '@actions/tool-cache';
import path from 'path';
import fs from 'fs';
@@ -8,6 +7,7 @@ import semver from 'semver';
import {JavaBase} from '../base-installer.js';
import {IZuluPackageDetails, IZuluVersions} from './models.js';
import {
cacheJdkDir,
extractJdkFile,
getDownloadArchiveExtension,
convertVersionToSemver,
@@ -122,7 +122,7 @@ export class ZuluDistribution extends JavaBase {
const archiveName = fs.readdirSync(extractedJavaPath)[0];
const archivePath = path.join(extractedJavaPath, archiveName);
const javaPath = await tc.cacheDir(
const javaPath = await cacheJdkDir(
archivePath,
this.toolcacheFolderName,
this.getToolcacheVersionName(javaRelease.version),