mirror of
				https://gitea.com/actions/setup-java.git
				synced 2025-10-31 07:47:06 +00:00 
			
		
		
		
	generated and pretty files
This commit is contained in:
		| @@ -22,14 +22,14 @@ const core = __importStar(require("@actions/core")); | ||||
| const io = __importStar(require("@actions/io")); | ||||
| exports.M2_DIR = '.m2'; | ||||
| exports.SETTINGS_FILE = 'settings.xml'; | ||||
| function configAuthentication(username, password) { | ||||
| function configAuthentication(id, username, password) { | ||||
|     return __awaiter(this, void 0, void 0, function* () { | ||||
|         if (username && password) { | ||||
|         if (id && username && password) { | ||||
|             core.debug(`configAuthentication with ${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(username, password)); | ||||
|             yield write(directory, generate(id, username, password)); | ||||
|         } | ||||
|         else { | ||||
|             core.debug(`no auth without username: ${username} and password: ${password}`); | ||||
| @@ -38,11 +38,12 @@ function configAuthentication(username, password) { | ||||
| } | ||||
| exports.configAuthentication = configAuthentication; | ||||
| // only exported for testing purposes | ||||
| function generate(username, password) { | ||||
| function generate(id, username, password) { | ||||
|     return ` | ||||
|   <settings> | ||||
|       <servers> | ||||
|         <server> | ||||
|           <id>${id}</id> | ||||
|           <username>${username}</username> | ||||
|           <password>${password}</password> | ||||
|         </server> | ||||
|   | ||||
| @@ -29,11 +29,14 @@ function run() { | ||||
|             const arch = core.getInput('architecture', { required: true }); | ||||
|             const jdkFile = core.getInput('jdkFile', { required: false }) || ''; | ||||
|             yield installer.getJava(version, arch, jdkFile); | ||||
|             const username = core.getInput('username', { required: false }); | ||||
|             const password = core.getInput('password', { required: false }); | ||||
|             yield auth.configAuthentication(username, password); | ||||
|             const matchersPath = path.join(__dirname, '..', '.github'); | ||||
|             console.log(`##[add-matcher]${path.join(matchersPath, 'java.json')}`); | ||||
|             const id = core.getInput('id', { required: false }); | ||||
|             const username = core.getInput('username', { required: false }); | ||||
|             const password = core.getInput('password', { required: false }); | ||||
|             if (id && username && password) { | ||||
|                 yield auth.configAuthentication(id, username, password); | ||||
|             } | ||||
|         } | ||||
|         catch (error) { | ||||
|             core.setFailed(error.message); | ||||
|   | ||||
| @@ -7,7 +7,11 @@ import * as io from '@actions/io'; | ||||
| export const M2_DIR = '.m2'; | ||||
| export const SETTINGS_FILE = 'settings.xml'; | ||||
|  | ||||
| export async function configAuthentication(id: string, username: string, password: string) { | ||||
| export async function configAuthentication( | ||||
|   id: string, | ||||
|   username: string, | ||||
|   password: string | ||||
| ) { | ||||
|   if (id && username && password) { | ||||
|     core.debug(`configAuthentication with ${username} and a password`); | ||||
|     const directory: string = path.join(os.homedir(), M2_DIR); | ||||
|   | ||||
| @@ -25,7 +25,6 @@ async function run() { | ||||
|     if (id && username && password) { | ||||
|       await auth.configAuthentication(id, username, password); | ||||
|     } | ||||
|  | ||||
|   } catch (error) { | ||||
|     core.setFailed(error.message); | ||||
|   } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Bryan Clark
					Bryan Clark