actions/setup-java
1
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2024-12-25 08:22:16 -05:00
Code Issues Projects Releases Packages Wiki Activity

Use console.log where appropriate

Browse source
This commit is contained in:
Bryan Clark 2019-11-28 12:54:29 -08:00
parent 24327359f8
commit b8a0027e2c
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/auth.js
View file

@ -25,14 +25,14 @@ exports.SETTINGS_FILE = 'settings.xml';
function configAuthentication(id, username, password) {
return __awaiter(this, void 0, void 0, function* () {
if (id && username && password) {
core.debug(`configAuthentication with ${username} and a password`);
console.log(`creating ${exports.SETTINGS_FILE} with server-id: ${id}, username: ${username}, and a password`);
const directory = path.join(os.homedir(), exports.M2_DIR);
yield io.mkdirP(directory);
core.debug(`created directory ${directory}`);
yield write(directory, generate(id, username, password));
}
else {
core.debug(`no auth without username: ${username} and password: ${password}`);
core.debug(`no ${exports.SETTINGS_FILE} without server-id: ${id}, username: ${username}, and a password`);
}
});
}
@ -56,7 +56,7 @@ function write(directory, settings) {
return __awaiter(this, void 0, void 0, function* () {
const options = { encoding: 'utf-8' };
const location = path.join(directory, exports.SETTINGS_FILE);
core.debug(`writing ${location}`);
console.log(`writing ${location}`);
return fs.writeFileSync(location, settings, options);
});
}

2
lib/setup-java.js
View file

@ -31,7 +31,7 @@ function run() {
yield installer.getJava(version, arch, jdkFile);
const matchersPath = path.join(__dirname, '..', '.github');
console.log(`##[add-matcher]${path.join(matchersPath, 'java.json')}`);
const id = core.getInput('id', { required: false });
const id = core.getInput('server-id', { required: false });
const username = core.getInput('username', { required: false });
const password = core.getInput('password', { required: false });
if (id && username && password) {

8
src/auth.ts
View file

@ -13,14 +13,16 @@ export async function configAuthentication(
password: string
) {
if (id && username && password) {
core.debug(`configAuthentication with ${username} and a password`);
console.log(
`creating ${SETTINGS_FILE} with server-id: ${id}, username: ${username}, and a password`
);
const directory: string = path.join(os.homedir(), M2_DIR);
await io.mkdirP(directory);
core.debug(`created directory ${directory}`);
await write(directory, generate(id, username, password));
} else {
core.debug(
`no auth without username: ${username} and password: ${password}`
`no ${SETTINGS_FILE} without server-id: ${id}, username: ${username}, and a password`
);
}
}
@ -43,6 +45,6 @@ export function generate(id: string, username: string, password: string) {
async function write(directory: string, settings: string) {
const options = {encoding: 'utf-8'};
const location = path.join(directory, SETTINGS_FILE);
core.debug(`writing ${location}`);
console.log(`writing ${location}`);
return fs.writeFileSync(location, settings, options);
}