Skip to content

Commit 4f3734a

Browse files
mhoffrogmhoffrog
committed
Update compiled dist scripts after re-base to main
1 parent 993bbb6 commit 4f3734a

File tree

2 files changed

+50
-26
lines changed

2 files changed

+50
-26
lines changed

‎dist/cleanup/index.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88096,7 +88096,7 @@ else {
8809688096
"use strict";
8809788097

8809888098
Object.defineProperty(exports, "__esModule", ({ value: true }));
88099-
exports.DISTRIBUTIONS_ONLY_MAJOR_VERSION = exports.INPUT_MVN_TOOLCHAIN_VENDOR = exports.INPUT_MVN_TOOLCHAIN_ID = exports.MVN_TOOLCHAINS_FILE = exports.MVN_SETTINGS_FILE = exports.M2_DIR = exports.STATE_GPG_PRIVATE_KEY_FINGERPRINT = exports.INPUT_JOB_STATUS = exports.INPUT_CACHE_DEPENDENCY_PATH = exports.INPUT_CACHE = exports.INPUT_DEFAULT_GPG_PASSPHRASE = exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = exports.INPUT_GPG_PASSPHRASE = exports.INPUT_GPG_PRIVATE_KEY = exports.INPUT_OVERWRITE_SETTINGS = exports.INPUT_SETTINGS_PATH = exports.INPUT_SERVER_PASSWORD = exports.INPUT_SERVER_USERNAME = exports.INPUT_SERVER_ID = exports.INPUT_CHECK_LATEST = exports.INPUT_JDK_FILE = exports.INPUT_DISTRIBUTION = exports.INPUT_JAVA_PACKAGE = exports.INPUT_ARCHITECTURE = exports.INPUT_JAVA_VERSION_FILE = exports.INPUT_JAVA_VERSION = exports.MACOS_JAVA_CONTENT_POSTFIX = void 0;
88099+
exports.DISTRIBUTIONS_ONLY_MAJOR_VERSION = exports.INPUT_MVN_TOOLCHAIN_VENDOR = exports.INPUT_MVN_TOOLCHAIN_ID = exports.MVN_TOOLCHAINS_FILE = exports.MVN_SETTINGS_FILE = exports.M2_DIR = exports.STATE_GPG_PRIVATE_KEY_FINGERPRINT = exports.INPUT_JOB_STATUS = exports.INPUT_CACHE_DEPENDENCY_PATH = exports.INPUT_CACHE = exports.INPUT_DEFAULT_GPG_PASSPHRASE = exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = exports.INPUT_GPG_PASSPHRASE = exports.INPUT_GPG_PRIVATE_KEY = exports.INPUT_ADD_TO_PATH = exports.INPUT_UPDATE_JAVA_HOME = exports.INPUT_UPDATE_TOOLCHAINS_ONLY = exports.INPUT_OVERWRITE_SETTINGS = exports.INPUT_SETTINGS_PATH = exports.INPUT_SERVER_PASSWORD = exports.INPUT_SERVER_USERNAME = exports.INPUT_SERVER_ID = exports.INPUT_CHECK_LATEST = exports.INPUT_JDK_FILE = exports.INPUT_DISTRIBUTION = exports.INPUT_JAVA_PACKAGE = exports.INPUT_ARCHITECTURE = exports.INPUT_JAVA_VERSION_FILE = exports.INPUT_JAVA_VERSION = exports.MACOS_JAVA_CONTENT_POSTFIX = void 0;
8810088100
exports.MACOS_JAVA_CONTENT_POSTFIX = 'Contents/Home';
8810188101
exports.INPUT_JAVA_VERSION = 'java-version';
8810288102
exports.INPUT_JAVA_VERSION_FILE = 'java-version-file';
@@ -88110,6 +88110,9 @@ exports.INPUT_SERVER_USERNAME = 'server-username';
8811088110
exports.INPUT_SERVER_PASSWORD = 'server-password';
8811188111
exports.INPUT_SETTINGS_PATH = 'settings-path';
8811288112
exports.INPUT_OVERWRITE_SETTINGS = 'overwrite-settings';
88113+
exports.INPUT_UPDATE_TOOLCHAINS_ONLY = 'update-toolchains-only';
88114+
exports.INPUT_UPDATE_JAVA_HOME = 'update-env-javahome';
88115+
exports.INPUT_ADD_TO_PATH = 'add-to-env-path';
8811388116
exports.INPUT_GPG_PRIVATE_KEY = 'gpg-private-key';
8811488117
exports.INPUT_GPG_PASSPHRASE = 'gpg-passphrase';
8811588118
exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = undefined;

‎dist/setup/index.js‎

Lines changed: 46 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -122936,15 +122936,13 @@ const os = __importStar(__nccwpck_require__(22037));
122936122936
const xmlbuilder2_1 = __nccwpck_require__(70151);
122937122937
const constants = __importStar(__nccwpck_require__(69042));
122938122938
const gpg = __importStar(__nccwpck_require__(23759));
122939-
const util_1 = __nccwpck_require__(92629);
122940-
function configureAuthentication() {
122939+
function configureAuthentication(overwriteSettings) {
122941122940
return __awaiter(this, void 0, void 0, function* () {
122942122941
const id = core.getInput(constants.INPUT_SERVER_ID);
122943122942
const username = core.getInput(constants.INPUT_SERVER_USERNAME);
122944122943
const password = core.getInput(constants.INPUT_SERVER_PASSWORD);
122945122944
const settingsDirectory = core.getInput(constants.INPUT_SETTINGS_PATH) ||
122946122945
path.join(os.homedir(), constants.M2_DIR);
122947-
const overwriteSettings = (0, util_1.getBooleanInput)(constants.INPUT_OVERWRITE_SETTINGS, true);
122948122946
const gpgPrivateKey = core.getInput(constants.INPUT_GPG_PRIVATE_KEY) ||
122949122947
constants.INPUT_DEFAULT_GPG_PRIVATE_KEY;
122950122948
const gpgPassphrase = core.getInput(constants.INPUT_GPG_PASSPHRASE) ||
@@ -123240,7 +123238,7 @@ function isProbablyGradleDaemonProblem(packageManager, error) {
123240123238
"use strict";
123241123239

123242123240
Object.defineProperty(exports, "__esModule", ({ value: true }));
123243-
exports.DISTRIBUTIONS_ONLY_MAJOR_VERSION = exports.INPUT_MVN_TOOLCHAIN_VENDOR = exports.INPUT_MVN_TOOLCHAIN_ID = exports.MVN_TOOLCHAINS_FILE = exports.MVN_SETTINGS_FILE = exports.M2_DIR = exports.STATE_GPG_PRIVATE_KEY_FINGERPRINT = exports.INPUT_JOB_STATUS = exports.INPUT_CACHE_DEPENDENCY_PATH = exports.INPUT_CACHE = exports.INPUT_DEFAULT_GPG_PASSPHRASE = exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = exports.INPUT_GPG_PASSPHRASE = exports.INPUT_GPG_PRIVATE_KEY = exports.INPUT_OVERWRITE_SETTINGS = exports.INPUT_SETTINGS_PATH = exports.INPUT_SERVER_PASSWORD = exports.INPUT_SERVER_USERNAME = exports.INPUT_SERVER_ID = exports.INPUT_CHECK_LATEST = exports.INPUT_JDK_FILE = exports.INPUT_DISTRIBUTION = exports.INPUT_JAVA_PACKAGE = exports.INPUT_ARCHITECTURE = exports.INPUT_JAVA_VERSION_FILE = exports.INPUT_JAVA_VERSION = exports.MACOS_JAVA_CONTENT_POSTFIX = void 0;
123241+
exports.DISTRIBUTIONS_ONLY_MAJOR_VERSION = exports.INPUT_MVN_TOOLCHAIN_VENDOR = exports.INPUT_MVN_TOOLCHAIN_ID = exports.MVN_TOOLCHAINS_FILE = exports.MVN_SETTINGS_FILE = exports.M2_DIR = exports.STATE_GPG_PRIVATE_KEY_FINGERPRINT = exports.INPUT_JOB_STATUS = exports.INPUT_CACHE_DEPENDENCY_PATH = exports.INPUT_CACHE = exports.INPUT_DEFAULT_GPG_PASSPHRASE = exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = exports.INPUT_GPG_PASSPHRASE = exports.INPUT_GPG_PRIVATE_KEY = exports.INPUT_ADD_TO_PATH = exports.INPUT_UPDATE_JAVA_HOME = exports.INPUT_UPDATE_TOOLCHAINS_ONLY = exports.INPUT_OVERWRITE_SETTINGS = exports.INPUT_SETTINGS_PATH = exports.INPUT_SERVER_PASSWORD = exports.INPUT_SERVER_USERNAME = exports.INPUT_SERVER_ID = exports.INPUT_CHECK_LATEST = exports.INPUT_JDK_FILE = exports.INPUT_DISTRIBUTION = exports.INPUT_JAVA_PACKAGE = exports.INPUT_ARCHITECTURE = exports.INPUT_JAVA_VERSION_FILE = exports.INPUT_JAVA_VERSION = exports.MACOS_JAVA_CONTENT_POSTFIX = void 0;
123244123242
exports.MACOS_JAVA_CONTENT_POSTFIX = 'Contents/Home';
123245123243
exports.INPUT_JAVA_VERSION = 'java-version';
123246123244
exports.INPUT_JAVA_VERSION_FILE = 'java-version-file';
@@ -123254,6 +123252,9 @@ exports.INPUT_SERVER_USERNAME = 'server-username';
123254123252
exports.INPUT_SERVER_PASSWORD = 'server-password';
123255123253
exports.INPUT_SETTINGS_PATH = 'settings-path';
123256123254
exports.INPUT_OVERWRITE_SETTINGS = 'overwrite-settings';
123255+
exports.INPUT_UPDATE_TOOLCHAINS_ONLY = 'update-toolchains-only';
123256+
exports.INPUT_UPDATE_JAVA_HOME = 'update-env-javahome';
123257+
exports.INPUT_ADD_TO_PATH = 'add-to-env-path';
123257123258
exports.INPUT_GPG_PRIVATE_KEY = 'gpg-private-key';
123258123259
exports.INPUT_GPG_PASSPHRASE = 'gpg-passphrase';
123259123260
exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = undefined;
@@ -123512,6 +123513,8 @@ class JavaBase {
123512123513
this.architecture = installerOptions.architecture || os_1.default.arch();
123513123514
this.packageType = installerOptions.packageType;
123514123515
this.checkLatest = installerOptions.checkLatest;
123516+
this.updateEnvJavaHome = installerOptions.updateEnvJavaHome;
123517+
this.addToEnvPath = installerOptions.addToEnvPath;
123515123518
}
123516123519
setupJava() {
123517123520
return __awaiter(this, void 0, void 0, function* () {
@@ -123613,8 +123616,18 @@ class JavaBase {
123613123616
}
123614123617
setJavaDefault(version, toolPath) {
123615123618
const majorVersion = version.split('.')[0];
123616-
core.exportVariable('JAVA_HOME', toolPath);
123617-
core.addPath(path_1.default.join(toolPath, 'bin'));
123619+
if (this.updateEnvJavaHome) {
123620+
core.exportVariable('JAVA_HOME', toolPath);
123621+
}
123622+
else {
123623+
core.info(`Skip updating env.JAVA_HOME according to ${constants_1.INPUT_UPDATE_JAVA_HOME}`);
123624+
}
123625+
if (this.addToEnvPath) {
123626+
core.addPath(path_1.default.join(toolPath, 'bin'));
123627+
}
123628+
else {
123629+
core.info(`Skip adding to env.PATH according to ${constants_1.INPUT_ADD_TO_PATH}`);
123630+
}
123618123631
core.setOutput('distribution', this.distribution);
123619123632
core.setOutput('path', toolPath);
123620123633
core.setOutput('version', version);
@@ -125353,6 +125366,10 @@ function run() {
125353125366
const cache = core.getInput(constants.INPUT_CACHE);
125354125367
const cacheDependencyPath = core.getInput(constants.INPUT_CACHE_DEPENDENCY_PATH);
125355125368
const checkLatest = (0, util_1.getBooleanInput)(constants.INPUT_CHECK_LATEST, false);
125369+
const updateToolchainsOnly = (0, util_1.getBooleanInput)(constants.INPUT_UPDATE_TOOLCHAINS_ONLY, false);
125370+
const overwriteSettings = (0, util_1.getBooleanInput)(constants.INPUT_OVERWRITE_SETTINGS, !updateToolchainsOnly);
125371+
const updateEnvJavaHome = (0, util_1.getBooleanInput)(constants.INPUT_UPDATE_JAVA_HOME, !updateToolchainsOnly);
125372+
const addToEnvPath = (0, util_1.getBooleanInput)(constants.INPUT_ADD_TO_PATH, !updateToolchainsOnly);
125356125373
let toolchainIds = core.getMultilineInput(constants.INPUT_MVN_TOOLCHAIN_ID);
125357125374
core.startGroup('Installed distributions');
125358125375
if (versions.length !== toolchainIds.length) {
@@ -125367,7 +125384,11 @@ function run() {
125367125384
checkLatest,
125368125385
distributionName,
125369125386
jdkFile,
125370-
toolchainIds
125387+
toolchainIds,
125388+
updateToolchainsOnly,
125389+
overwriteSettings,
125390+
updateEnvJavaHome,
125391+
addToEnvPath
125371125392
};
125372125393
if (!versions.length) {
125373125394
core.debug('java-version input is empty, looking for java-version-file input');
@@ -125385,7 +125406,7 @@ function run() {
125385125406
core.endGroup();
125386125407
const matchersPath = path.join(__dirname, '..', '..', '.github');
125387125408
core.info(`##[add-matcher]${path.join(matchersPath, 'java.json')}`);
125388-
yield auth.configureAuthentication();
125409+
yield auth.configureAuthentication(overwriteSettings);
125389125410
if (cache && (0, util_1.isCacheFeatureAvailable)()) {
125390125411
yield (0, cache_1.restore)(cache, cacheDependencyPath);
125391125412
}
@@ -125398,19 +125419,21 @@ function run() {
125398125419
run();
125399125420
function installVersion(version, options, toolchainId = 0) {
125400125421
return __awaiter(this, void 0, void 0, function* () {
125401-
const { distributionName, jdkFile, architecture, packageType, checkLatest, toolchainIds } = options;
125422+
const { distributionName, jdkFile, architecture, packageType, checkLatest, toolchainIds, updateToolchainsOnly, overwriteSettings, updateEnvJavaHome, addToEnvPath } = options;
125402125423
const installerOptions = {
125424+
version,
125403125425
architecture,
125404125426
packageType,
125405125427
checkLatest,
125406-
version
125428+
updateEnvJavaHome,
125429+
addToEnvPath
125407125430
};
125408125431
const distribution = (0, distribution_factory_1.getJavaDistribution)(distributionName, installerOptions, jdkFile);
125409125432
if (!distribution) {
125410125433
throw new Error(`No supported distribution was found for input ${distributionName}`);
125411125434
}
125412125435
const result = yield distribution.setupJava();
125413-
yield toolchains.configureToolchains(version, distributionName, result.path, toolchainIds[toolchainId]);
125436+
yield toolchains.configureToolchains(version, distributionName, result.path, overwriteSettings || updateToolchainsOnly, toolchainIds[toolchainId]);
125414125437
core.info('');
125415125438
core.info('Java configuration:');
125416125439
core.info(` Distribution: ${distributionName}`);
@@ -125468,15 +125491,13 @@ const path = __importStar(__nccwpck_require__(71017));
125468125491
const core = __importStar(__nccwpck_require__(42186));
125469125492
const io = __importStar(__nccwpck_require__(47351));
125470125493
const constants = __importStar(__nccwpck_require__(69042));
125471-
const util_1 = __nccwpck_require__(92629);
125472125494
const xmlbuilder2_1 = __nccwpck_require__(70151);
125473-
function configureToolchains(version, distributionName, jdkHome, toolchainId) {
125495+
function configureToolchains(version, distributionName, jdkHome, updateToolchains, toolchainId) {
125474125496
return __awaiter(this, void 0, void 0, function* () {
125475125497
const vendor = core.getInput(constants.INPUT_MVN_TOOLCHAIN_VENDOR) || distributionName;
125476125498
const id = toolchainId || `${vendor}_${version}`;
125477125499
const settingsDirectory = core.getInput(constants.INPUT_SETTINGS_PATH) ||
125478125500
path.join(os.homedir(), constants.M2_DIR);
125479-
const overwriteSettings = (0, util_1.getBooleanInput)(constants.INPUT_OVERWRITE_SETTINGS, true);
125480125501
yield createToolchainsSettings({
125481125502
jdkInfo: {
125482125503
version,
@@ -125485,20 +125506,20 @@ function configureToolchains(version, distributionName, jdkHome, toolchainId) {
125485125506
jdkHome
125486125507
},
125487125508
settingsDirectory,
125488-
overwriteSettings
125509+
updateToolchains
125489125510
});
125490125511
});
125491125512
}
125492125513
exports.configureToolchains = configureToolchains;
125493-
function createToolchainsSettings({ jdkInfo, settingsDirectory, overwriteSettings }) {
125514+
function createToolchainsSettings({ jdkInfo, settingsDirectory, updateToolchains }) {
125494125515
return __awaiter(this, void 0, void 0, function* () {
125495-
core.info(`Creating ${constants.MVN_TOOLCHAINS_FILE} for JDK version ${jdkInfo.version} from ${jdkInfo.vendor}`);
125516+
core.info(`Adding a toolchain entry in ${constants.MVN_TOOLCHAINS_FILE} for JDK version ${jdkInfo.version} from ${jdkInfo.vendor}`);
125496125517
// when an alternate m2 location is specified use only that location (no .m2 directory)
125497125518
// otherwise use the home/.m2/ path
125498125519
yield io.mkdirP(settingsDirectory);
125499125520
const originalToolchains = yield readExistingToolchainsFile(settingsDirectory);
125500125521
const updatedToolchains = generateToolchainDefinition(originalToolchains, jdkInfo.version, jdkInfo.vendor, jdkInfo.id, jdkInfo.jdkHome);
125501-
yield writeToolchainsFileToDisk(settingsDirectory, updatedToolchains, overwriteSettings);
125522+
yield writeToolchainsFileToDisk(settingsDirectory, updatedToolchains, updateToolchains);
125502125523
});
125503125524
}
125504125525
exports.createToolchainsSettings = createToolchainsSettings;
@@ -125564,18 +125585,18 @@ function readExistingToolchainsFile(directory) {
125564125585
return '';
125565125586
});
125566125587
}
125567-
function writeToolchainsFileToDisk(directory, settings, overwriteSettings) {
125588+
function writeToolchainsFileToDisk(directory, settings, updateToolchains) {
125568125589
return __awaiter(this, void 0, void 0, function* () {
125569125590
const location = path.join(directory, constants.MVN_TOOLCHAINS_FILE);
125570-
const settingsExists = fs.existsSync(location);
125571-
if (settingsExists && overwriteSettings) {
125572-
core.info(`Overwriting existing file ${location}`);
125591+
const toolchainsExists = fs.existsSync(location);
125592+
if (toolchainsExists && updateToolchains) {
125593+
core.info(`Updating existing file ${location}`);
125573125594
}
125574-
else if (!settingsExists) {
125575-
core.info(`Writing to ${location}`);
125595+
else if (!toolchainsExists) {
125596+
core.info(`Creating file ${location}`);
125576125597
}
125577125598
else {
125578-
core.info(`Skipping generation of ${location} because file already exists and overwriting is not enabled`);
125599+
core.info(`Skipping update of ${location} since file already exists and updating is not enabled`);
125579125600
return;
125580125601
}
125581125602
return fs.writeFileSync(location, settings, {

0 commit comments

Comments
 (0)