Skip to content

Commit 774eb61

Browse files
mhoffrogmhoffrog
committed
Update compiled dist scripts after re-base to main
1 parent 9532bf6 commit 774eb61

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
@@ -93365,7 +93365,7 @@ else {
9336593365
"use strict";
9336693366

9336793367
Object.defineProperty(exports, "__esModule", ({ value: true }));
93368-
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;
93368+
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;
9336993369
exports.MACOS_JAVA_CONTENT_POSTFIX = 'Contents/Home';
9337093370
exports.INPUT_JAVA_VERSION = 'java-version';
9337193371
exports.INPUT_JAVA_VERSION_FILE = 'java-version-file';
@@ -93379,6 +93379,9 @@ exports.INPUT_SERVER_USERNAME = 'server-username';
9337993379
exports.INPUT_SERVER_PASSWORD = 'server-password';
9338093380
exports.INPUT_SETTINGS_PATH = 'settings-path';
9338193381
exports.INPUT_OVERWRITE_SETTINGS = 'overwrite-settings';
93382+
exports.INPUT_UPDATE_TOOLCHAINS_ONLY = 'update-toolchains-only';
93383+
exports.INPUT_UPDATE_JAVA_HOME = 'update-env-javahome';
93384+
exports.INPUT_ADD_TO_PATH = 'add-to-env-path';
9338293385
exports.INPUT_GPG_PRIVATE_KEY = 'gpg-private-key';
9338393386
exports.INPUT_GPG_PASSPHRASE = 'gpg-passphrase';
9338493387
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
@@ -128205,15 +128205,13 @@ const os = __importStar(__nccwpck_require__(22037));
128205128205
const xmlbuilder2_1 = __nccwpck_require__(70151);
128206128206
const constants = __importStar(__nccwpck_require__(69042));
128207128207
const gpg = __importStar(__nccwpck_require__(23759));
128208-
const util_1 = __nccwpck_require__(92629);
128209-
function configureAuthentication() {
128208+
function configureAuthentication(overwriteSettings) {
128210128209
return __awaiter(this, void 0, void 0, function* () {
128211128210
const id = core.getInput(constants.INPUT_SERVER_ID);
128212128211
const username = core.getInput(constants.INPUT_SERVER_USERNAME);
128213128212
const password = core.getInput(constants.INPUT_SERVER_PASSWORD);
128214128213
const settingsDirectory = core.getInput(constants.INPUT_SETTINGS_PATH) ||
128215128214
path.join(os.homedir(), constants.M2_DIR);
128216-
const overwriteSettings = (0, util_1.getBooleanInput)(constants.INPUT_OVERWRITE_SETTINGS, true);
128217128215
const gpgPrivateKey = core.getInput(constants.INPUT_GPG_PRIVATE_KEY) ||
128218128216
constants.INPUT_DEFAULT_GPG_PRIVATE_KEY;
128219128217
const gpgPassphrase = core.getInput(constants.INPUT_GPG_PASSPHRASE) ||
@@ -128509,7 +128507,7 @@ function isProbablyGradleDaemonProblem(packageManager, error) {
128509128507
"use strict";
128510128508

128511128509
Object.defineProperty(exports, "__esModule", ({ value: true }));
128512-
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;
128510+
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;
128513128511
exports.MACOS_JAVA_CONTENT_POSTFIX = 'Contents/Home';
128514128512
exports.INPUT_JAVA_VERSION = 'java-version';
128515128513
exports.INPUT_JAVA_VERSION_FILE = 'java-version-file';
@@ -128523,6 +128521,9 @@ exports.INPUT_SERVER_USERNAME = 'server-username';
128523128521
exports.INPUT_SERVER_PASSWORD = 'server-password';
128524128522
exports.INPUT_SETTINGS_PATH = 'settings-path';
128525128523
exports.INPUT_OVERWRITE_SETTINGS = 'overwrite-settings';
128524+
exports.INPUT_UPDATE_TOOLCHAINS_ONLY = 'update-toolchains-only';
128525+
exports.INPUT_UPDATE_JAVA_HOME = 'update-env-javahome';
128526+
exports.INPUT_ADD_TO_PATH = 'add-to-env-path';
128526128527
exports.INPUT_GPG_PRIVATE_KEY = 'gpg-private-key';
128527128528
exports.INPUT_GPG_PASSPHRASE = 'gpg-passphrase';
128528128529
exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = undefined;
@@ -128784,6 +128785,8 @@ class JavaBase {
128784128785
this.architecture = installerOptions.architecture || os_1.default.arch();
128785128786
this.packageType = installerOptions.packageType;
128786128787
this.checkLatest = installerOptions.checkLatest;
128788+
this.updateEnvJavaHome = installerOptions.updateEnvJavaHome;
128789+
this.addToEnvPath = installerOptions.addToEnvPath;
128787128790
}
128788128791
setupJava() {
128789128792
return __awaiter(this, void 0, void 0, function* () {
@@ -128885,8 +128888,18 @@ class JavaBase {
128885128888
}
128886128889
setJavaDefault(version, toolPath) {
128887128890
const majorVersion = version.split('.')[0];
128888-
core.exportVariable('JAVA_HOME', toolPath);
128889-
core.addPath(path_1.default.join(toolPath, 'bin'));
128891+
if (this.updateEnvJavaHome) {
128892+
core.exportVariable('JAVA_HOME', toolPath);
128893+
}
128894+
else {
128895+
core.info(`Skip updating env.JAVA_HOME according to ${constants_1.INPUT_UPDATE_JAVA_HOME}`);
128896+
}
128897+
if (this.addToEnvPath) {
128898+
core.addPath(path_1.default.join(toolPath, 'bin'));
128899+
}
128900+
else {
128901+
core.info(`Skip adding to env.PATH according to ${constants_1.INPUT_ADD_TO_PATH}`);
128902+
}
128890128903
core.setOutput('distribution', this.distribution);
128891128904
core.setOutput('path', toolPath);
128892128905
core.setOutput('version', version);
@@ -131253,6 +131266,10 @@ function run() {
131253131266
const cache = core.getInput(constants.INPUT_CACHE);
131254131267
const cacheDependencyPath = core.getInput(constants.INPUT_CACHE_DEPENDENCY_PATH);
131255131268
const checkLatest = (0, util_1.getBooleanInput)(constants.INPUT_CHECK_LATEST, false);
131269+
const updateToolchainsOnly = (0, util_1.getBooleanInput)(constants.INPUT_UPDATE_TOOLCHAINS_ONLY, false);
131270+
const overwriteSettings = (0, util_1.getBooleanInput)(constants.INPUT_OVERWRITE_SETTINGS, !updateToolchainsOnly);
131271+
const updateEnvJavaHome = (0, util_1.getBooleanInput)(constants.INPUT_UPDATE_JAVA_HOME, !updateToolchainsOnly);
131272+
const addToEnvPath = (0, util_1.getBooleanInput)(constants.INPUT_ADD_TO_PATH, !updateToolchainsOnly);
131256131273
let toolchainIds = core.getMultilineInput(constants.INPUT_MVN_TOOLCHAIN_ID);
131257131274
core.startGroup('Installed distributions');
131258131275
if (versions.length !== toolchainIds.length) {
@@ -131267,7 +131284,11 @@ function run() {
131267131284
checkLatest,
131268131285
distributionName,
131269131286
jdkFile,
131270-
toolchainIds
131287+
toolchainIds,
131288+
updateToolchainsOnly,
131289+
overwriteSettings,
131290+
updateEnvJavaHome,
131291+
addToEnvPath
131271131292
};
131272131293
if (!versions.length) {
131273131294
core.debug('java-version input is empty, looking for java-version-file input');
@@ -131285,7 +131306,7 @@ function run() {
131285131306
core.endGroup();
131286131307
const matchersPath = path.join(__dirname, '..', '..', '.github');
131287131308
core.info(`##[add-matcher]${path.join(matchersPath, 'java.json')}`);
131288-
yield auth.configureAuthentication();
131309+
yield auth.configureAuthentication(overwriteSettings);
131289131310
if (cache && (0, util_1.isCacheFeatureAvailable)()) {
131290131311
yield (0, cache_1.restore)(cache, cacheDependencyPath);
131291131312
}
@@ -131298,19 +131319,21 @@ function run() {
131298131319
run();
131299131320
function installVersion(version, options, toolchainId = 0) {
131300131321
return __awaiter(this, void 0, void 0, function* () {
131301-
const { distributionName, jdkFile, architecture, packageType, checkLatest, toolchainIds } = options;
131322+
const { distributionName, jdkFile, architecture, packageType, checkLatest, toolchainIds, updateToolchainsOnly, overwriteSettings, updateEnvJavaHome, addToEnvPath } = options;
131302131323
const installerOptions = {
131324+
version,
131303131325
architecture,
131304131326
packageType,
131305131327
checkLatest,
131306-
version
131328+
updateEnvJavaHome,
131329+
addToEnvPath
131307131330
};
131308131331
const distribution = (0, distribution_factory_1.getJavaDistribution)(distributionName, installerOptions, jdkFile);
131309131332
if (!distribution) {
131310131333
throw new Error(`No supported distribution was found for input ${distributionName}`);
131311131334
}
131312131335
const result = yield distribution.setupJava();
131313-
yield toolchains.configureToolchains(version, distributionName, result.path, toolchainIds[toolchainId]);
131336+
yield toolchains.configureToolchains(version, distributionName, result.path, overwriteSettings || updateToolchainsOnly, toolchainIds[toolchainId]);
131314131337
core.info('');
131315131338
core.info('Java configuration:');
131316131339
core.info(` Distribution: ${distributionName}`);
@@ -131368,15 +131391,13 @@ const path = __importStar(__nccwpck_require__(71017));
131368131391
const core = __importStar(__nccwpck_require__(42186));
131369131392
const io = __importStar(__nccwpck_require__(47351));
131370131393
const constants = __importStar(__nccwpck_require__(69042));
131371-
const util_1 = __nccwpck_require__(92629);
131372131394
const xmlbuilder2_1 = __nccwpck_require__(70151);
131373-
function configureToolchains(version, distributionName, jdkHome, toolchainId) {
131395+
function configureToolchains(version, distributionName, jdkHome, updateToolchains, toolchainId) {
131374131396
return __awaiter(this, void 0, void 0, function* () {
131375131397
const vendor = core.getInput(constants.INPUT_MVN_TOOLCHAIN_VENDOR) || distributionName;
131376131398
const id = toolchainId || `${vendor}_${version}`;
131377131399
const settingsDirectory = core.getInput(constants.INPUT_SETTINGS_PATH) ||
131378131400
path.join(os.homedir(), constants.M2_DIR);
131379-
const overwriteSettings = (0, util_1.getBooleanInput)(constants.INPUT_OVERWRITE_SETTINGS, true);
131380131401
yield createToolchainsSettings({
131381131402
jdkInfo: {
131382131403
version,
@@ -131385,20 +131406,20 @@ function configureToolchains(version, distributionName, jdkHome, toolchainId) {
131385131406
jdkHome
131386131407
},
131387131408
settingsDirectory,
131388-
overwriteSettings
131409+
updateToolchains
131389131410
});
131390131411
});
131391131412
}
131392131413
exports.configureToolchains = configureToolchains;
131393-
function createToolchainsSettings({ jdkInfo, settingsDirectory, overwriteSettings }) {
131414+
function createToolchainsSettings({ jdkInfo, settingsDirectory, updateToolchains }) {
131394131415
return __awaiter(this, void 0, void 0, function* () {
131395-
core.info(`Creating ${constants.MVN_TOOLCHAINS_FILE} for JDK version ${jdkInfo.version} from ${jdkInfo.vendor}`);
131416+
core.info(`Adding a toolchain entry in ${constants.MVN_TOOLCHAINS_FILE} for JDK version ${jdkInfo.version} from ${jdkInfo.vendor}`);
131396131417
// when an alternate m2 location is specified use only that location (no .m2 directory)
131397131418
// otherwise use the home/.m2/ path
131398131419
yield io.mkdirP(settingsDirectory);
131399131420
const originalToolchains = yield readExistingToolchainsFile(settingsDirectory);
131400131421
const updatedToolchains = generateToolchainDefinition(originalToolchains, jdkInfo.version, jdkInfo.vendor, jdkInfo.id, jdkInfo.jdkHome);
131401-
yield writeToolchainsFileToDisk(settingsDirectory, updatedToolchains, overwriteSettings);
131422+
yield writeToolchainsFileToDisk(settingsDirectory, updatedToolchains, updateToolchains);
131402131423
});
131403131424
}
131404131425
exports.createToolchainsSettings = createToolchainsSettings;
@@ -131464,18 +131485,18 @@ function readExistingToolchainsFile(directory) {
131464131485
return '';
131465131486
});
131466131487
}
131467-
function writeToolchainsFileToDisk(directory, settings, overwriteSettings) {
131488+
function writeToolchainsFileToDisk(directory, settings, updateToolchains) {
131468131489
return __awaiter(this, void 0, void 0, function* () {
131469131490
const location = path.join(directory, constants.MVN_TOOLCHAINS_FILE);
131470-
const settingsExists = fs.existsSync(location);
131471-
if (settingsExists && overwriteSettings) {
131472-
core.info(`Overwriting existing file ${location}`);
131491+
const toolchainsExists = fs.existsSync(location);
131492+
if (toolchainsExists && updateToolchains) {
131493+
core.info(`Updating existing file ${location}`);
131473131494
}
131474-
else if (!settingsExists) {
131475-
core.info(`Writing to ${location}`);
131495+
else if (!toolchainsExists) {
131496+
core.info(`Creating file ${location}`);
131476131497
}
131477131498
else {
131478-
core.info(`Skipping generation of ${location} because file already exists and overwriting is not enabled`);
131499+
core.info(`Skipping update of ${location} since file already exists and updating is not enabled`);
131479131500
return;
131480131501
}
131481131502
return fs.writeFileSync(location, settings, {

0 commit comments

Comments
 (0)