Skip to content

Commit 1e22074

Browse files
mhoffrogmhoffrog
committed
Update compiled dist scripts after re-base to main
1 parent cfa3d8b commit 1e22074

File tree

2 files changed

+50
-26
lines changed

2 files changed

+50
-26
lines changed

‎dist/cleanup/index.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -88311,7 +88311,7 @@ else {
8831188311
"use strict";
8831288312

8831388313
Object.defineProperty(exports, "__esModule", ({ value: true }));
88314-
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;
88314+
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;
8831588315
exports.MACOS_JAVA_CONTENT_POSTFIX = 'Contents/Home';
8831688316
exports.INPUT_JAVA_VERSION = 'java-version';
8831788317
exports.INPUT_JAVA_VERSION_FILE = 'java-version-file';
@@ -88325,6 +88325,9 @@ exports.INPUT_SERVER_USERNAME = 'server-username';
8832588325
exports.INPUT_SERVER_PASSWORD = 'server-password';
8832688326
exports.INPUT_SETTINGS_PATH = 'settings-path';
8832788327
exports.INPUT_OVERWRITE_SETTINGS = 'overwrite-settings';
88328+
exports.INPUT_UPDATE_TOOLCHAINS_ONLY = 'update-toolchains-only';
88329+
exports.INPUT_UPDATE_JAVA_HOME = 'update-env-javahome';
88330+
exports.INPUT_ADD_TO_PATH = 'add-to-env-path';
8832888331
exports.INPUT_GPG_PRIVATE_KEY = 'gpg-private-key';
8832988332
exports.INPUT_GPG_PASSPHRASE = 'gpg-passphrase';
8833088333
exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = undefined;

‎dist/setup/index.js

+46-25
Original file line numberDiff line numberDiff line change
@@ -123151,15 +123151,13 @@ const os = __importStar(__nccwpck_require__(22037));
123151123151
const xmlbuilder2_1 = __nccwpck_require__(70151);
123152123152
const constants = __importStar(__nccwpck_require__(69042));
123153123153
const gpg = __importStar(__nccwpck_require__(23759));
123154-
const util_1 = __nccwpck_require__(92629);
123155-
function configureAuthentication() {
123154+
function configureAuthentication(overwriteSettings) {
123156123155
return __awaiter(this, void 0, void 0, function* () {
123157123156
const id = core.getInput(constants.INPUT_SERVER_ID);
123158123157
const username = core.getInput(constants.INPUT_SERVER_USERNAME);
123159123158
const password = core.getInput(constants.INPUT_SERVER_PASSWORD);
123160123159
const settingsDirectory = core.getInput(constants.INPUT_SETTINGS_PATH) ||
123161123160
path.join(os.homedir(), constants.M2_DIR);
123162-
const overwriteSettings = (0, util_1.getBooleanInput)(constants.INPUT_OVERWRITE_SETTINGS, true);
123163123161
const gpgPrivateKey = core.getInput(constants.INPUT_GPG_PRIVATE_KEY) ||
123164123162
constants.INPUT_DEFAULT_GPG_PRIVATE_KEY;
123165123163
const gpgPassphrase = core.getInput(constants.INPUT_GPG_PASSPHRASE) ||
@@ -123455,7 +123453,7 @@ function isProbablyGradleDaemonProblem(packageManager, error) {
123455123453
"use strict";
123456123454

123457123455
Object.defineProperty(exports, "__esModule", ({ value: true }));
123458-
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;
123456+
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;
123459123457
exports.MACOS_JAVA_CONTENT_POSTFIX = 'Contents/Home';
123460123458
exports.INPUT_JAVA_VERSION = 'java-version';
123461123459
exports.INPUT_JAVA_VERSION_FILE = 'java-version-file';
@@ -123469,6 +123467,9 @@ exports.INPUT_SERVER_USERNAME = 'server-username';
123469123467
exports.INPUT_SERVER_PASSWORD = 'server-password';
123470123468
exports.INPUT_SETTINGS_PATH = 'settings-path';
123471123469
exports.INPUT_OVERWRITE_SETTINGS = 'overwrite-settings';
123470+
exports.INPUT_UPDATE_TOOLCHAINS_ONLY = 'update-toolchains-only';
123471+
exports.INPUT_UPDATE_JAVA_HOME = 'update-env-javahome';
123472+
exports.INPUT_ADD_TO_PATH = 'add-to-env-path';
123472123473
exports.INPUT_GPG_PRIVATE_KEY = 'gpg-private-key';
123473123474
exports.INPUT_GPG_PASSPHRASE = 'gpg-passphrase';
123474123475
exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = undefined;
@@ -123730,6 +123731,8 @@ class JavaBase {
123730123731
this.architecture = installerOptions.architecture || os_1.default.arch();
123731123732
this.packageType = installerOptions.packageType;
123732123733
this.checkLatest = installerOptions.checkLatest;
123734+
this.updateEnvJavaHome = installerOptions.updateEnvJavaHome;
123735+
this.addToEnvPath = installerOptions.addToEnvPath;
123733123736
}
123734123737
setupJava() {
123735123738
return __awaiter(this, void 0, void 0, function* () {
@@ -123831,8 +123834,18 @@ class JavaBase {
123831123834
}
123832123835
setJavaDefault(version, toolPath) {
123833123836
const majorVersion = version.split('.')[0];
123834-
core.exportVariable('JAVA_HOME', toolPath);
123835-
core.addPath(path_1.default.join(toolPath, 'bin'));
123837+
if (this.updateEnvJavaHome) {
123838+
core.exportVariable('JAVA_HOME', toolPath);
123839+
}
123840+
else {
123841+
core.info(`Skip updating env.JAVA_HOME according to ${constants_1.INPUT_UPDATE_JAVA_HOME}`);
123842+
}
123843+
if (this.addToEnvPath) {
123844+
core.addPath(path_1.default.join(toolPath, 'bin'));
123845+
}
123846+
else {
123847+
core.info(`Skip adding to env.PATH according to ${constants_1.INPUT_ADD_TO_PATH}`);
123848+
}
123836123849
core.setOutput('distribution', this.distribution);
123837123850
core.setOutput('path', toolPath);
123838123851
core.setOutput('version', version);
@@ -126199,6 +126212,10 @@ function run() {
126199126212
const cache = core.getInput(constants.INPUT_CACHE);
126200126213
const cacheDependencyPath = core.getInput(constants.INPUT_CACHE_DEPENDENCY_PATH);
126201126214
const checkLatest = (0, util_1.getBooleanInput)(constants.INPUT_CHECK_LATEST, false);
126215+
const updateToolchainsOnly = (0, util_1.getBooleanInput)(constants.INPUT_UPDATE_TOOLCHAINS_ONLY, false);
126216+
const overwriteSettings = (0, util_1.getBooleanInput)(constants.INPUT_OVERWRITE_SETTINGS, !updateToolchainsOnly);
126217+
const updateEnvJavaHome = (0, util_1.getBooleanInput)(constants.INPUT_UPDATE_JAVA_HOME, !updateToolchainsOnly);
126218+
const addToEnvPath = (0, util_1.getBooleanInput)(constants.INPUT_ADD_TO_PATH, !updateToolchainsOnly);
126202126219
let toolchainIds = core.getMultilineInput(constants.INPUT_MVN_TOOLCHAIN_ID);
126203126220
core.startGroup('Installed distributions');
126204126221
if (versions.length !== toolchainIds.length) {
@@ -126213,7 +126230,11 @@ function run() {
126213126230
checkLatest,
126214126231
distributionName,
126215126232
jdkFile,
126216-
toolchainIds
126233+
toolchainIds,
126234+
updateToolchainsOnly,
126235+
overwriteSettings,
126236+
updateEnvJavaHome,
126237+
addToEnvPath
126217126238
};
126218126239
if (!versions.length) {
126219126240
core.debug('java-version input is empty, looking for java-version-file input');
@@ -126231,7 +126252,7 @@ function run() {
126231126252
core.endGroup();
126232126253
const matchersPath = path.join(__dirname, '..', '..', '.github');
126233126254
core.info(`##[add-matcher]${path.join(matchersPath, 'java.json')}`);
126234-
yield auth.configureAuthentication();
126255+
yield auth.configureAuthentication(overwriteSettings);
126235126256
if (cache && (0, util_1.isCacheFeatureAvailable)()) {
126236126257
yield (0, cache_1.restore)(cache, cacheDependencyPath);
126237126258
}
@@ -126244,19 +126265,21 @@ function run() {
126244126265
run();
126245126266
function installVersion(version, options, toolchainId = 0) {
126246126267
return __awaiter(this, void 0, void 0, function* () {
126247-
const { distributionName, jdkFile, architecture, packageType, checkLatest, toolchainIds } = options;
126268+
const { distributionName, jdkFile, architecture, packageType, checkLatest, toolchainIds, updateToolchainsOnly, overwriteSettings, updateEnvJavaHome, addToEnvPath } = options;
126248126269
const installerOptions = {
126270+
version,
126249126271
architecture,
126250126272
packageType,
126251126273
checkLatest,
126252-
version
126274+
updateEnvJavaHome,
126275+
addToEnvPath
126253126276
};
126254126277
const distribution = (0, distribution_factory_1.getJavaDistribution)(distributionName, installerOptions, jdkFile);
126255126278
if (!distribution) {
126256126279
throw new Error(`No supported distribution was found for input ${distributionName}`);
126257126280
}
126258126281
const result = yield distribution.setupJava();
126259-
yield toolchains.configureToolchains(version, distributionName, result.path, toolchainIds[toolchainId]);
126282+
yield toolchains.configureToolchains(version, distributionName, result.path, overwriteSettings || updateToolchainsOnly, toolchainIds[toolchainId]);
126260126283
core.info('');
126261126284
core.info('Java configuration:');
126262126285
core.info(` Distribution: ${distributionName}`);
@@ -126314,15 +126337,13 @@ const path = __importStar(__nccwpck_require__(71017));
126314126337
const core = __importStar(__nccwpck_require__(42186));
126315126338
const io = __importStar(__nccwpck_require__(47351));
126316126339
const constants = __importStar(__nccwpck_require__(69042));
126317-
const util_1 = __nccwpck_require__(92629);
126318126340
const xmlbuilder2_1 = __nccwpck_require__(70151);
126319-
function configureToolchains(version, distributionName, jdkHome, toolchainId) {
126341+
function configureToolchains(version, distributionName, jdkHome, updateToolchains, toolchainId) {
126320126342
return __awaiter(this, void 0, void 0, function* () {
126321126343
const vendor = core.getInput(constants.INPUT_MVN_TOOLCHAIN_VENDOR) || distributionName;
126322126344
const id = toolchainId || `${vendor}_${version}`;
126323126345
const settingsDirectory = core.getInput(constants.INPUT_SETTINGS_PATH) ||
126324126346
path.join(os.homedir(), constants.M2_DIR);
126325-
const overwriteSettings = (0, util_1.getBooleanInput)(constants.INPUT_OVERWRITE_SETTINGS, true);
126326126347
yield createToolchainsSettings({
126327126348
jdkInfo: {
126328126349
version,
@@ -126331,20 +126352,20 @@ function configureToolchains(version, distributionName, jdkHome, toolchainId) {
126331126352
jdkHome
126332126353
},
126333126354
settingsDirectory,
126334-
overwriteSettings
126355+
updateToolchains
126335126356
});
126336126357
});
126337126358
}
126338126359
exports.configureToolchains = configureToolchains;
126339-
function createToolchainsSettings({ jdkInfo, settingsDirectory, overwriteSettings }) {
126360+
function createToolchainsSettings({ jdkInfo, settingsDirectory, updateToolchains }) {
126340126361
return __awaiter(this, void 0, void 0, function* () {
126341-
core.info(`Creating ${constants.MVN_TOOLCHAINS_FILE} for JDK version ${jdkInfo.version} from ${jdkInfo.vendor}`);
126362+
core.info(`Adding a toolchain entry in ${constants.MVN_TOOLCHAINS_FILE} for JDK version ${jdkInfo.version} from ${jdkInfo.vendor}`);
126342126363
// when an alternate m2 location is specified use only that location (no .m2 directory)
126343126364
// otherwise use the home/.m2/ path
126344126365
yield io.mkdirP(settingsDirectory);
126345126366
const originalToolchains = yield readExistingToolchainsFile(settingsDirectory);
126346126367
const updatedToolchains = generateToolchainDefinition(originalToolchains, jdkInfo.version, jdkInfo.vendor, jdkInfo.id, jdkInfo.jdkHome);
126347-
yield writeToolchainsFileToDisk(settingsDirectory, updatedToolchains, overwriteSettings);
126368+
yield writeToolchainsFileToDisk(settingsDirectory, updatedToolchains, updateToolchains);
126348126369
});
126349126370
}
126350126371
exports.createToolchainsSettings = createToolchainsSettings;
@@ -126410,18 +126431,18 @@ function readExistingToolchainsFile(directory) {
126410126431
return '';
126411126432
});
126412126433
}
126413-
function writeToolchainsFileToDisk(directory, settings, overwriteSettings) {
126434+
function writeToolchainsFileToDisk(directory, settings, updateToolchains) {
126414126435
return __awaiter(this, void 0, void 0, function* () {
126415126436
const location = path.join(directory, constants.MVN_TOOLCHAINS_FILE);
126416-
const settingsExists = fs.existsSync(location);
126417-
if (settingsExists && overwriteSettings) {
126418-
core.info(`Overwriting existing file ${location}`);
126437+
const toolchainsExists = fs.existsSync(location);
126438+
if (toolchainsExists && updateToolchains) {
126439+
core.info(`Updating existing file ${location}`);
126419126440
}
126420-
else if (!settingsExists) {
126421-
core.info(`Writing to ${location}`);
126441+
else if (!toolchainsExists) {
126442+
core.info(`Creating file ${location}`);
126422126443
}
126423126444
else {
126424-
core.info(`Skipping generation of ${location} because file already exists and overwriting is not enabled`);
126445+
core.info(`Skipping update of ${location} since file already exists and updating is not enabled`);
126425126446
return;
126426126447
}
126427126448
return fs.writeFileSync(location, settings, {

0 commit comments

Comments
 (0)