Skip to content

Commit 4d8dc69

Browse files
committed
fixing defaults
1 parent 2d0e474 commit 4d8dc69

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

action.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ inputs:
2121
description: 'Path to where the compressed JDK is located. The path could
2222
be in your source repository or a local path on the agent.'
2323
required: false
24-
default: ''
2524
server-id:
2625
description: 'ID of the distributionManagement repository in the pom.xml
2726
file. Default is `github`'

dist/cleanup/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -965,6 +965,7 @@ exports.INPUT_SERVER_PASSWORD = 'server-password';
965965
exports.INPUT_SETTINGS_PATH = 'settings-path';
966966
exports.INPUT_GPG_PRIVATE_KEY = 'gpg-private-key';
967967
exports.INPUT_GPG_PASSPHRASE = 'gpg-passphrase';
968+
exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = undefined;
968969
exports.INPUT_DEFAULT_GPG_PASSPHRASE = 'GPG_PASSPHRASE';
969970
exports.STATE_GPG_PRIVATE_KEY_FINGERPRINT = 'gpg-private-key-fingerprint';
970971

dist/setup/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25665,6 +25665,7 @@ exports.INPUT_SERVER_PASSWORD = 'server-password';
2566525665
exports.INPUT_SETTINGS_PATH = 'settings-path';
2566625666
exports.INPUT_GPG_PRIVATE_KEY = 'gpg-private-key';
2566725667
exports.INPUT_GPG_PASSPHRASE = 'gpg-passphrase';
25668+
exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = undefined;
2566825669
exports.INPUT_DEFAULT_GPG_PASSPHRASE = 'GPG_PASSPHRASE';
2566925670
exports.STATE_GPG_PRIVATE_KEY_FINGERPRINT = 'gpg-private-key-fingerprint';
2567025671

@@ -28698,9 +28699,8 @@ function run() {
2869828699
const password = core.getInput(constants.INPUT_SERVER_PASSWORD, {
2869928700
required: false
2870028701
});
28701-
const gpgPrivateKey = core.getInput(constants.INPUT_GPG_PRIVATE_KEY, {
28702-
required: false
28703-
});
28702+
const gpgPrivateKey = core.getInput(constants.INPUT_GPG_PRIVATE_KEY, { required: false }) ||
28703+
constants.INPUT_DEFAULT_GPG_PRIVATE_KEY;
2870428704
const gpgPassphrase = core.getInput(constants.INPUT_GPG_PASSPHRASE, { required: false }) ||
2870528705
(gpgPrivateKey ? constants.INPUT_DEFAULT_GPG_PASSPHRASE : undefined);
2870628706
if (gpgPrivateKey) {

src/constants.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ export const INPUT_SETTINGS_PATH = 'settings-path';
1010
export const INPUT_GPG_PRIVATE_KEY = 'gpg-private-key';
1111
export const INPUT_GPG_PASSPHRASE = 'gpg-passphrase';
1212

13+
export const INPUT_DEFAULT_GPG_PRIVATE_KEY = undefined;
1314
export const INPUT_DEFAULT_GPG_PASSPHRASE = 'GPG_PASSPHRASE';
1415

1516
export const STATE_GPG_PRIVATE_KEY_FINGERPRINT = 'gpg-private-key-fingerprint';

src/setup-java.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ async function run() {
2929
const password = core.getInput(constants.INPUT_SERVER_PASSWORD, {
3030
required: false
3131
});
32-
const gpgPrivateKey = core.getInput(constants.INPUT_GPG_PRIVATE_KEY, {
33-
required: false
34-
});
32+
const gpgPrivateKey =
33+
core.getInput(constants.INPUT_GPG_PRIVATE_KEY, {required: false}) ||
34+
constants.INPUT_DEFAULT_GPG_PRIVATE_KEY;
3535
const gpgPassphrase =
3636
core.getInput(constants.INPUT_GPG_PASSPHRASE, {required: false}) ||
3737
(gpgPrivateKey ? constants.INPUT_DEFAULT_GPG_PASSPHRASE : undefined);

0 commit comments

Comments
 (0)