actions/setup-java
1
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2026-09-04 01:53:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Set default signature verification for supported distributions (#1246)

Browse Source 
* Default signature verification for supported distributions

* Delegate signature defaults to installers
This commit is contained in:
John
2026-08-24 10:08:03 -04:00
committed by GitHub
parent 1dbac3c9e1
commit b96213d9d2
9 changed files with 82 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/distributions/base-installer.ts
+2 -1
View File
@@ -68,7 +68,8 @@ export abstract class JavaBase {
installerOptions.setDefault !== undefined
? installerOptions.setDefault
: true;
this.verifySignature = installerOptions.verifySignature ?? false;
this.verifySignature =
installerOptions.verifySignature ?? this.supportsSignatureVerification();
this.verifySignaturePublicKey = installerOptions.verifySignaturePublicKey;
}
src/setup-java.ts
+11 -5
View File
@@ -29,10 +29,6 @@ export async function run() {
const checkLatest = getBooleanInput(constants.INPUT_CHECK_LATEST, false);
const forceDownload = getBooleanInput(constants.INPUT_FORCE_DOWNLOAD, false);
const setDefault = getBooleanInput(constants.INPUT_SET_DEFAULT, true);
const verifySignature = getBooleanInput(
constants.INPUT_VERIFY_SIGNATURE,
false
);
const verifySignaturePublicKey =
core.getInput(constants.INPUT_VERIFY_SIGNATURE_PUBLIC_KEY) || undefined;
const toolchainIds = core.getMultilineInput(constants.INPUT_MVN_TOOLCHAIN_ID);
@@ -80,6 +76,8 @@ export async function run() {
);
}
const verifySignature = getVerifySignatureInput();
const installerInputsOptions: installerInputsOptions = {
architecture,
packageType,
@@ -107,6 +105,8 @@ export async function run() {
throw new Error('distribution input is required');
}
const verifySignature = getVerifySignatureInput();
const installerInputsOptions: installerInputsOptions = {
architecture,
packageType,
@@ -192,6 +192,12 @@ function getJdkFileInput(): string {
return jdkFile || deprecatedJdkFile;
}
function getVerifySignatureInput(): boolean | undefined {
return core.getInput(constants.INPUT_VERIFY_SIGNATURE).trim()
? getBooleanInput(constants.INPUT_VERIFY_SIGNATURE)
: undefined;
}
async function installVersion(
version: string,
options: installerInputsOptions,
@@ -263,7 +269,7 @@ interface installerInputsOptions {
forceDownload: boolean;
cacheJdk: boolean;
setDefault: boolean;
verifySignature: boolean;
verifySignature: boolean | undefined;
verifySignaturePublicKey: string | undefined;
distributionName: string;
jdkFile: string;