From 18983b8d3d6bbec73377e2c02d64915f1d0be621 Mon Sep 17 00:00:00 2001 From: Bryan Clark Date: Thu, 28 Nov 2019 13:10:44 -0800 Subject: [PATCH] Update gitattributes and remove lib files --- .gitattributes | 4 +- dist/index.js | 175 +++++++++++++++++++++++++++++++++++++++++----- lib/auth.js | 62 ---------------- lib/setup-java.js | 46 ------------ 4 files changed, 161 insertions(+), 126 deletions(-) delete mode 100644 lib/auth.js delete mode 100644 lib/setup-java.js diff --git a/.gitattributes b/.gitattributes index 33c6624..f787af8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ -lib/*.js -diff -merge -lib/*.js linguist-generated=true +dist/index.js -diff -merge +dist/index.js linguist-generated=true diff --git a/dist/index.js b/dist/index.js index 2ec6b32..b904df6 100644 --- a/dist/index.js +++ b/dist/index.js @@ -34,7 +34,7 @@ module.exports = /******/ // the startup function /******/ function startup() { /******/ // Load entry module and return exports -/******/ return __webpack_require__(264); +/******/ return __webpack_require__(429); /******/ }; /******/ /******/ // run startup @@ -71,7 +71,21 @@ module.exports = require("https"); /***/ }), -/***/ 264: +/***/ 357: +/***/ (function(module) { + +module.exports = require("assert"); + +/***/ }), + +/***/ 417: +/***/ (function(module) { + +module.exports = require("crypto"); + +/***/ }), + +/***/ 429: /***/ (function(module, __unusedexports, __webpack_require__) { module.exports = @@ -150,6 +164,82 @@ module.exports = __webpack_require__(211); /***/ 264: /***/ (function(module, __unusedexports, __nested_webpack_require_1759__) { +module.exports = +/******/ (function(modules, runtime) { // webpackBootstrap +/******/ "use strict"; +/******/ // The module cache +/******/ var installedModules = {}; +/******/ +/******/ // The require function +/******/ function __webpack_require__(moduleId) { +/******/ +/******/ // Check if module is in cache +/******/ if(installedModules[moduleId]) { +/******/ return installedModules[moduleId].exports; +/******/ } +/******/ // Create a new module (and put it into the cache) +/******/ var module = installedModules[moduleId] = { +/******/ i: moduleId, +/******/ l: false, +/******/ exports: {} +/******/ }; +/******/ +/******/ // Execute the module function +/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); +/******/ +/******/ // Flag the module as loaded +/******/ module.l = true; +/******/ +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } +/******/ +/******/ +/******/ __webpack_require__.ab = __dirname + "/"; +/******/ +/******/ // the startup function +/******/ function startup() { +/******/ // Load entry module and return exports +/******/ return __webpack_require__(264); +/******/ }; +/******/ +/******/ // run startup +/******/ return startup(); +/******/ }) +/************************************************************************/ +/******/ ({ + +/***/ 16: +/***/ (function(module) { + +module.exports = __nested_webpack_require_1759__(16); + +/***/ }), + +/***/ 87: +/***/ (function(module) { + +module.exports = __nested_webpack_require_1759__(87); + +/***/ }), + +/***/ 129: +/***/ (function(module) { + +module.exports = __nested_webpack_require_1759__(129); + +/***/ }), + +/***/ 211: +/***/ (function(module) { + +module.exports = __nested_webpack_require_1759__(211); + +/***/ }), + +/***/ 264: +/***/ (function(module, __unusedexports, __nested_webpack_require_1759__) { + module.exports = /******/ (function(modules, runtime) { // webpackBootstrap /******/ "use strict"; @@ -4910,6 +5000,73 @@ module.exports = __nested_webpack_require_1759__(835); /***/ 357: /***/ (function(module) { +module.exports = __nested_webpack_require_1759__(357); + +/***/ }), + +/***/ 417: +/***/ (function(module) { + +module.exports = __nested_webpack_require_1759__(417); + +/***/ }), + +/***/ 605: +/***/ (function(module) { + +module.exports = __nested_webpack_require_1759__(605); + +/***/ }), + +/***/ 614: +/***/ (function(module) { + +module.exports = __nested_webpack_require_1759__(614); + +/***/ }), + +/***/ 622: +/***/ (function(module) { + +module.exports = __nested_webpack_require_1759__(622); + +/***/ }), + +/***/ 631: +/***/ (function(module) { + +module.exports = __nested_webpack_require_1759__(631); + +/***/ }), + +/***/ 669: +/***/ (function(module) { + +module.exports = __nested_webpack_require_1759__(669); + +/***/ }), + +/***/ 747: +/***/ (function(module) { + +module.exports = __nested_webpack_require_1759__(747); + +/***/ }), + +/***/ 835: +/***/ (function(module) { + +module.exports = __nested_webpack_require_1759__(835); + +/***/ }) + +/******/ }); + +/***/ }), + +/***/ 357: +/***/ (function(module) { + module.exports = __webpack_require__(357); /***/ }), @@ -4974,20 +5131,6 @@ module.exports = __webpack_require__(835); /***/ }), -/***/ 357: -/***/ (function(module) { - -module.exports = require("assert"); - -/***/ }), - -/***/ 417: -/***/ (function(module) { - -module.exports = require("crypto"); - -/***/ }), - /***/ 605: /***/ (function(module) { diff --git a/lib/auth.js b/lib/auth.js deleted file mode 100644 index f8d795a..0000000 --- a/lib/auth.js +++ /dev/null @@ -1,62 +0,0 @@ -"use strict"; -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -var __importStar = (this && this.__importStar) || function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k]; - result["default"] = mod; - return result; -}; -Object.defineProperty(exports, "__esModule", { value: true }); -const fs = __importStar(require("fs")); -const os = __importStar(require("os")); -const path = __importStar(require("path")); -const core = __importStar(require("@actions/core")); -const io = __importStar(require("@actions/io")); -exports.M2_DIR = '.m2'; -exports.SETTINGS_FILE = 'settings.xml'; -function configAuthentication(id, username, password) { - return __awaiter(this, void 0, void 0, function* () { - if (id && username && 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 ${exports.SETTINGS_FILE} without server-id: ${id}, username: ${username}, and a password`); - } - }); -} -exports.configAuthentication = configAuthentication; -// only exported for testing purposes -function generate(id, username, password) { - return ` - - - - ${id} - ${username} - ${password} - - - - `; -} -exports.generate = generate; -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); - console.log(`writing ${location}`); - return fs.writeFileSync(location, settings, options); - }); -} diff --git a/lib/setup-java.js b/lib/setup-java.js deleted file mode 100644 index 5372cbb..0000000 --- a/lib/setup-java.js +++ /dev/null @@ -1,46 +0,0 @@ -"use strict"; -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -var __importStar = (this && this.__importStar) || function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k]; - result["default"] = mod; - return result; -}; -Object.defineProperty(exports, "__esModule", { value: true }); -const core = __importStar(require("@actions/core")); -const installer = __importStar(require("./installer")); -const auth = __importStar(require("./auth")); -const path = __importStar(require("path")); -function run() { - return __awaiter(this, void 0, void 0, function* () { - try { - let version = core.getInput('version'); - if (!version) { - version = core.getInput('java-version', { required: true }); - } - const arch = core.getInput('architecture', { required: true }); - const jdkFile = core.getInput('jdkFile', { required: false }) || ''; - 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('server-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); - } - }); -} -run();