Skip to content

Commit 2f3fa47

Browse files
mhoffrogmhoffrog
committed
Update compiled dist scripts after re-base to main
1 parent 2262f4b commit 2f3fa47

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
@@ -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‎

Lines changed: 46 additions & 25 deletions
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;
@@ -123727,6 +123728,8 @@ class JavaBase {
123727123728
this.architecture = installerOptions.architecture || os_1.default.arch();
123728123729
this.packageType = installerOptions.packageType;
123729123730
this.checkLatest = installerOptions.checkLatest;
123731+
this.updateEnvJavaHome = installerOptions.updateEnvJavaHome;
123732+
this.addToEnvPath = installerOptions.addToEnvPath;
123730123733
}
123731123734
setupJava() {
123732123735
return __awaiter(this, void 0, void 0, function* () {
@@ -123828,8 +123831,18 @@ class JavaBase {
123828123831
}
123829123832
setJavaDefault(version, toolPath) {
123830123833
const majorVersion = version.split('.')[0];
123831-
core.exportVariable('JAVA_HOME', toolPath);
123832-
core.addPath(path_1.default.join(toolPath, 'bin'));
123834+
if (this.updateEnvJavaHome) {
123835+
core.exportVariable('JAVA_HOME', toolPath);
123836+
}
123837+
else {
123838+
core.info(`Skip updating env.JAVA_HOME according to ${constants_1.INPUT_UPDATE_JAVA_HOME}`);
123839+
}
123840+
if (this.addToEnvPath) {
123841+
core.addPath(path_1.default.join(toolPath, 'bin'));
123842+
}
123843+
else {
123844+
core.info(`Skip adding to env.PATH according to ${constants_1.INPUT_ADD_TO_PATH}`);
123845+
}
123833123846
core.setOutput('distribution', this.distribution);
123834123847
core.setOutput('path', toolPath);
123835123848
core.setOutput('version', version);
@@ -125568,6 +125581,10 @@ function run() {
125568125581
const cache = core.getInput(constants.INPUT_CACHE);
125569125582
const cacheDependencyPath = core.getInput(constants.INPUT_CACHE_DEPENDENCY_PATH);
125570125583
const checkLatest = (0, util_1.getBooleanInput)(constants.INPUT_CHECK_LATEST, false);
125584+
const updateToolchainsOnly = (0, util_1.getBooleanInput)(constants.INPUT_UPDATE_TOOLCHAINS_ONLY, false);
125585+
const overwriteSettings = (0, util_1.getBooleanInput)(constants.INPUT_OVERWRITE_SETTINGS, !updateToolchainsOnly);
125586+
const updateEnvJavaHome = (0, util_1.getBooleanInput)(constants.INPUT_UPDATE_JAVA_HOME, !updateToolchainsOnly);
125587+
const addToEnvPath = (0, util_1.getBooleanInput)(constants.INPUT_ADD_TO_PATH, !updateToolchainsOnly);
125571125588
let toolchainIds = core.getMultilineInput(constants.INPUT_MVN_TOOLCHAIN_ID);
125572125589
core.startGroup('Installed distributions');
125573125590
if (versions.length !== toolchainIds.length) {
@@ -125582,7 +125599,11 @@ function run() {
125582125599
checkLatest,
125583125600
distributionName,
125584125601
jdkFile,
125585-
toolchainIds
125602+
toolchainIds,
125603+
updateToolchainsOnly,
125604+
overwriteSettings,
125605+
updateEnvJavaHome,
125606+
addToEnvPath
125586125607
};
125587125608
if (!versions.length) {
125588125609
core.debug('java-version input is empty, looking for java-version-file input');
@@ -125600,7 +125621,7 @@ function run() {
125600125621
core.endGroup();
125601125622
const matchersPath = path.join(__dirname, '..', '..', '.github');
125602125623
core.info(`##[add-matcher]${path.join(matchersPath, 'java.json')}`);
125603-
yield auth.configureAuthentication();
125624+
yield auth.configureAuthentication(overwriteSettings);
125604125625
if (cache && (0, util_1.isCacheFeatureAvailable)()) {
125605125626
yield (0, cache_1.restore)(cache, cacheDependencyPath);
125606125627
}
@@ -125613,19 +125634,21 @@ function run() {
125613125634
run();
125614125635
function installVersion(version, options, toolchainId = 0) {
125615125636
return __awaiter(this, void 0, void 0, function* () {
125616-
const { distributionName, jdkFile, architecture, packageType, checkLatest, toolchainIds } = options;
125637+
const { distributionName, jdkFile, architecture, packageType, checkLatest, toolchainIds, updateToolchainsOnly, overwriteSettings, updateEnvJavaHome, addToEnvPath } = options;
125617125638
const installerOptions = {
125639+
version,
125618125640
architecture,
125619125641
packageType,
125620125642
checkLatest,
125621-
version
125643+
updateEnvJavaHome,
125644+
addToEnvPath
125622125645
};
125623125646
const distribution = (0, distribution_factory_1.getJavaDistribution)(distributionName, installerOptions, jdkFile);
125624125647
if (!distribution) {
125625125648
throw new Error(`No supported distribution was found for input ${distributionName}`);
125626125649
}
125627125650
const result = yield distribution.setupJava();
125628-
yield toolchains.configureToolchains(version, distributionName, result.path, toolchainIds[toolchainId]);
125651+
yield toolchains.configureToolchains(version, distributionName, result.path, overwriteSettings || updateToolchainsOnly, toolchainIds[toolchainId]);
125629125652
core.info('');
125630125653
core.info('Java configuration:');
125631125654
core.info(` Distribution: ${distributionName}`);
@@ -125683,15 +125706,13 @@ const path = __importStar(__nccwpck_require__(71017));
125683125706
const core = __importStar(__nccwpck_require__(42186));
125684125707
const io = __importStar(__nccwpck_require__(47351));
125685125708
const constants = __importStar(__nccwpck_require__(69042));
125686-
const util_1 = __nccwpck_require__(92629);
125687125709
const xmlbuilder2_1 = __nccwpck_require__(70151);
125688-
function configureToolchains(version, distributionName, jdkHome, toolchainId) {
125710+
function configureToolchains(version, distributionName, jdkHome, updateToolchains, toolchainId) {
125689125711
return __awaiter(this, void 0, void 0, function* () {
125690125712
const vendor = core.getInput(constants.INPUT_MVN_TOOLCHAIN_VENDOR) || distributionName;
125691125713
const id = toolchainId || `${vendor}_${version}`;
125692125714
const settingsDirectory = core.getInput(constants.INPUT_SETTINGS_PATH) ||
125693125715
path.join(os.homedir(), constants.M2_DIR);
125694-
const overwriteSettings = (0, util_1.getBooleanInput)(constants.INPUT_OVERWRITE_SETTINGS, true);
125695125716
yield createToolchainsSettings({
125696125717
jdkInfo: {
125697125718
version,
@@ -125700,20 +125721,20 @@ function configureToolchains(version, distributionName, jdkHome, toolchainId) {
125700125721
jdkHome
125701125722
},
125702125723
settingsDirectory,
125703-
overwriteSettings
125724+
updateToolchains
125704125725
});
125705125726
});
125706125727
}
125707125728
exports.configureToolchains = configureToolchains;
125708-
function createToolchainsSettings({ jdkInfo, settingsDirectory, overwriteSettings }) {
125729+
function createToolchainsSettings({ jdkInfo, settingsDirectory, updateToolchains }) {
125709125730
return __awaiter(this, void 0, void 0, function* () {
125710-
core.info(`Creating ${constants.MVN_TOOLCHAINS_FILE} for JDK version ${jdkInfo.version} from ${jdkInfo.vendor}`);
125731+
core.info(`Adding a toolchain entry in ${constants.MVN_TOOLCHAINS_FILE} for JDK version ${jdkInfo.version} from ${jdkInfo.vendor}`);
125711125732
// when an alternate m2 location is specified use only that location (no .m2 directory)
125712125733
// otherwise use the home/.m2/ path
125713125734
yield io.mkdirP(settingsDirectory);
125714125735
const originalToolchains = yield readExistingToolchainsFile(settingsDirectory);
125715125736
const updatedToolchains = generateToolchainDefinition(originalToolchains, jdkInfo.version, jdkInfo.vendor, jdkInfo.id, jdkInfo.jdkHome);
125716-
yield writeToolchainsFileToDisk(settingsDirectory, updatedToolchains, overwriteSettings);
125737+
yield writeToolchainsFileToDisk(settingsDirectory, updatedToolchains, updateToolchains);
125717125738
});
125718125739
}
125719125740
exports.createToolchainsSettings = createToolchainsSettings;
@@ -125779,18 +125800,18 @@ function readExistingToolchainsFile(directory) {
125779125800
return '';
125780125801
});
125781125802
}
125782-
function writeToolchainsFileToDisk(directory, settings, overwriteSettings) {
125803+
function writeToolchainsFileToDisk(directory, settings, updateToolchains) {
125783125804
return __awaiter(this, void 0, void 0, function* () {
125784125805
const location = path.join(directory, constants.MVN_TOOLCHAINS_FILE);
125785-
const settingsExists = fs.existsSync(location);
125786-
if (settingsExists && overwriteSettings) {
125787-
core.info(`Overwriting existing file ${location}`);
125806+
const toolchainsExists = fs.existsSync(location);
125807+
if (toolchainsExists && updateToolchains) {
125808+
core.info(`Updating existing file ${location}`);
125788125809
}
125789-
else if (!settingsExists) {
125790-
core.info(`Writing to ${location}`);
125810+
else if (!toolchainsExists) {
125811+
core.info(`Creating file ${location}`);
125791125812
}
125792125813
else {
125793-
core.info(`Skipping generation of ${location} because file already exists and overwriting is not enabled`);
125814+
core.info(`Skipping update of ${location} since file already exists and updating is not enabled`);
125794125815
return;
125795125816
}
125796125817
return fs.writeFileSync(location, settings, {

0 commit comments

Comments
 (0)