mirror of
https://github.com/actions/setup-java.git
synced 2026-08-25 19:42:57 +00:00
Set default signature verification for supported distributions (#1246)
* Default signature verification for supported distributions * Delegate signature defaults to installers
This commit is contained in:
Vendored
+2
-1
@@ -244,7 +244,8 @@ class JavaBase {
|
||||
installerOptions.setDefault !== undefined
|
||||
? installerOptions.setDefault
|
||||
: true;
|
||||
this.verifySignature = installerOptions.verifySignature ?? false;
|
||||
this.verifySignature =
|
||||
installerOptions.verifySignature ?? this.supportsSignatureVerification();
|
||||
this.verifySignaturePublicKey = installerOptions.verifySignaturePublicKey;
|
||||
}
|
||||
async downloadAndVerify(javaRelease) {
|
||||
|
||||
Vendored
+7
-1
@@ -36376,7 +36376,6 @@ async function run() {
|
||||
const checkLatest = (0,util/* getBooleanInput */.Vt)(constants/* INPUT_CHECK_LATEST */.YM, false);
|
||||
const forceDownload = (0,util/* getBooleanInput */.Vt)(constants/* INPUT_FORCE_DOWNLOAD */.I9, false);
|
||||
const setDefault = (0,util/* getBooleanInput */.Vt)(constants/* INPUT_SET_DEFAULT */.E8, true);
|
||||
const verifySignature = (0,util/* getBooleanInput */.Vt)(constants/* INPUT_VERIFY_SIGNATURE */.qy, false);
|
||||
const verifySignaturePublicKey = setup_java_core/* getInput */.V4(constants/* INPUT_VERIFY_SIGNATURE_PUBLIC_KEY */.u) || undefined;
|
||||
const toolchainIds = setup_java_core/* getMultilineInput */.q3(constants/* INPUT_MVN_TOOLCHAIN_ID */.nr);
|
||||
let actionError;
|
||||
@@ -36404,6 +36403,7 @@ async function run() {
|
||||
else if (!distributionName) {
|
||||
throw new Error('distribution input is required when not specified in the version file');
|
||||
}
|
||||
const verifySignature = getVerifySignatureInput();
|
||||
const installerInputsOptions = {
|
||||
architecture,
|
||||
packageType,
|
||||
@@ -36428,6 +36428,7 @@ async function run() {
|
||||
if (!distributionName) {
|
||||
throw new Error('distribution input is required');
|
||||
}
|
||||
const verifySignature = getVerifySignatureInput();
|
||||
const installerInputsOptions = {
|
||||
architecture,
|
||||
packageType,
|
||||
@@ -36492,6 +36493,11 @@ function getJdkFileInput() {
|
||||
}
|
||||
return jdkFile || deprecatedJdkFile;
|
||||
}
|
||||
function getVerifySignatureInput() {
|
||||
return setup_java_core/* getInput */.V4(constants/* INPUT_VERIFY_SIGNATURE */.qy).trim()
|
||||
? (0,util/* getBooleanInput */.Vt)(constants/* INPUT_VERIFY_SIGNATURE */.qy)
|
||||
: undefined;
|
||||
}
|
||||
async function installVersion(version, options, toolchainId = 0) {
|
||||
const { distributionName, jdkFile, architecture, packageType, checkLatest, forceDownload, cacheJdk, setDefault, verifySignature, verifySignaturePublicKey, toolchainIds } = options;
|
||||
const installerOptions = {
|
||||
|
||||
Reference in New Issue
Block a user