diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d7292f6..e49d7b4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,6 @@ jobs: - name: Install EDM uses: ./ with: - edm-version: 3.7.0 + edm-version: 4.0.0 - name: Show EDM versions run: edm versions diff --git a/dist/index.js b/dist/index.js index f5b271f..61b106f 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1,7 +1,7 @@ /******/ (() => { // webpackBootstrap /******/ var __webpack_modules__ = ({ -/***/ 652: +/***/ 603: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { "use strict"; @@ -27,8 +27,8 @@ var __importStar = (this && this.__importStar) || function (mod) { }; Object.defineProperty(exports, "__esModule", ({ value: true })); exports.issue = exports.issueCommand = void 0; -const os = __importStar(__nccwpck_require__(37)); -const utils_1 = __nccwpck_require__(402); +const os = __importStar(__nccwpck_require__(857)); +const utils_1 = __nccwpck_require__(439); /** * Commands * @@ -100,7 +100,7 @@ function escapeProperty(s) { /***/ }), -/***/ 519: +/***/ 195: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { "use strict"; @@ -135,12 +135,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }; Object.defineProperty(exports, "__esModule", ({ value: true })); exports.getIDToken = exports.getState = exports.saveState = exports.group = exports.endGroup = exports.startGroup = exports.info = exports.notice = exports.warning = exports.error = exports.debug = exports.isDebug = exports.setFailed = exports.setCommandEcho = exports.setOutput = exports.getBooleanInput = exports.getMultilineInput = exports.getInput = exports.addPath = exports.setSecret = exports.exportVariable = exports.ExitCode = void 0; -const command_1 = __nccwpck_require__(652); -const file_command_1 = __nccwpck_require__(313); -const utils_1 = __nccwpck_require__(402); -const os = __importStar(__nccwpck_require__(37)); -const path = __importStar(__nccwpck_require__(17)); -const oidc_utils_1 = __nccwpck_require__(174); +const command_1 = __nccwpck_require__(603); +const file_command_1 = __nccwpck_require__(166); +const utils_1 = __nccwpck_require__(439); +const os = __importStar(__nccwpck_require__(857)); +const path = __importStar(__nccwpck_require__(928)); +const oidc_utils_1 = __nccwpck_require__(265); /** * The code to exit an action */ @@ -425,17 +425,17 @@ exports.getIDToken = getIDToken; /** * Summary exports */ -var summary_1 = __nccwpck_require__(803); +var summary_1 = __nccwpck_require__(882); Object.defineProperty(exports, "summary", ({ enumerable: true, get: function () { return summary_1.summary; } })); /** * @deprecated use core.summary */ -var summary_2 = __nccwpck_require__(803); +var summary_2 = __nccwpck_require__(882); Object.defineProperty(exports, "markdownSummary", ({ enumerable: true, get: function () { return summary_2.markdownSummary; } })); /** * Path exports */ -var path_utils_1 = __nccwpck_require__(736); +var path_utils_1 = __nccwpck_require__(415); Object.defineProperty(exports, "toPosixPath", ({ enumerable: true, get: function () { return path_utils_1.toPosixPath; } })); Object.defineProperty(exports, "toWin32Path", ({ enumerable: true, get: function () { return path_utils_1.toWin32Path; } })); Object.defineProperty(exports, "toPlatformPath", ({ enumerable: true, get: function () { return path_utils_1.toPlatformPath; } })); @@ -443,7 +443,7 @@ Object.defineProperty(exports, "toPlatformPath", ({ enumerable: true, get: funct /***/ }), -/***/ 313: +/***/ 166: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { "use strict"; @@ -472,10 +472,10 @@ Object.defineProperty(exports, "__esModule", ({ value: true })); exports.prepareKeyValueMessage = exports.issueFileCommand = void 0; // We use any as a valid input type /* eslint-disable @typescript-eslint/no-explicit-any */ -const fs = __importStar(__nccwpck_require__(147)); -const os = __importStar(__nccwpck_require__(37)); -const uuid_1 = __nccwpck_require__(304); -const utils_1 = __nccwpck_require__(402); +const fs = __importStar(__nccwpck_require__(896)); +const os = __importStar(__nccwpck_require__(857)); +const uuid_1 = __nccwpck_require__(193); +const utils_1 = __nccwpck_require__(439); function issueFileCommand(command, message) { const filePath = process.env[`GITHUB_${command}`]; if (!filePath) { @@ -508,7 +508,7 @@ exports.prepareKeyValueMessage = prepareKeyValueMessage; /***/ }), -/***/ 174: +/***/ 265: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { "use strict"; @@ -524,9 +524,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }; Object.defineProperty(exports, "__esModule", ({ value: true })); exports.OidcClient = void 0; -const http_client_1 = __nccwpck_require__(422); -const auth_1 = __nccwpck_require__(714); -const core_1 = __nccwpck_require__(519); +const http_client_1 = __nccwpck_require__(803); +const auth_1 = __nccwpck_require__(569); +const core_1 = __nccwpck_require__(195); class OidcClient { static createHttpClient(allowRetry = true, maxRetry = 10) { const requestOptions = { @@ -592,7 +592,7 @@ exports.OidcClient = OidcClient; /***/ }), -/***/ 736: +/***/ 415: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { "use strict"; @@ -618,7 +618,7 @@ var __importStar = (this && this.__importStar) || function (mod) { }; Object.defineProperty(exports, "__esModule", ({ value: true })); exports.toPlatformPath = exports.toWin32Path = exports.toPosixPath = void 0; -const path = __importStar(__nccwpck_require__(17)); +const path = __importStar(__nccwpck_require__(928)); /** * toPosixPath converts the given path to the posix form. On Windows, \\ will be * replaced with /. @@ -657,7 +657,7 @@ exports.toPlatformPath = toPlatformPath; /***/ }), -/***/ 803: +/***/ 882: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { "use strict"; @@ -673,8 +673,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }; Object.defineProperty(exports, "__esModule", ({ value: true })); exports.summary = exports.markdownSummary = exports.SUMMARY_DOCS_URL = exports.SUMMARY_ENV_VAR = void 0; -const os_1 = __nccwpck_require__(37); -const fs_1 = __nccwpck_require__(147); +const os_1 = __nccwpck_require__(857); +const fs_1 = __nccwpck_require__(896); const { access, appendFile, writeFile } = fs_1.promises; exports.SUMMARY_ENV_VAR = 'GITHUB_STEP_SUMMARY'; exports.SUMMARY_DOCS_URL = 'https://docs.github.com/actions/using-workflows/workflow-commands-for-github-actions#adding-a-job-summary'; @@ -947,7 +947,7 @@ exports.summary = _summary; /***/ }), -/***/ 402: +/***/ 439: /***/ ((__unused_webpack_module, exports) => { "use strict"; @@ -994,7 +994,7 @@ exports.toCommandProperties = toCommandProperties; /***/ }), -/***/ 372: +/***/ 787: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { "use strict"; @@ -1016,7 +1016,7 @@ var __importStar = (this && this.__importStar) || function (mod) { return result; }; Object.defineProperty(exports, "__esModule", ({ value: true })); -const tr = __importStar(__nccwpck_require__(694)); +const tr = __importStar(__nccwpck_require__(606)); /** * Exec a command. * Output will be streamed to the live console. @@ -1045,7 +1045,7 @@ exports.exec = exec; /***/ }), -/***/ 694: +/***/ 606: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { "use strict"; @@ -1067,12 +1067,12 @@ var __importStar = (this && this.__importStar) || function (mod) { return result; }; Object.defineProperty(exports, "__esModule", ({ value: true })); -const os = __importStar(__nccwpck_require__(37)); -const events = __importStar(__nccwpck_require__(361)); -const child = __importStar(__nccwpck_require__(81)); -const path = __importStar(__nccwpck_require__(17)); -const io = __importStar(__nccwpck_require__(853)); -const ioUtil = __importStar(__nccwpck_require__(400)); +const os = __importStar(__nccwpck_require__(857)); +const events = __importStar(__nccwpck_require__(434)); +const child = __importStar(__nccwpck_require__(317)); +const path = __importStar(__nccwpck_require__(928)); +const io = __importStar(__nccwpck_require__(389)); +const ioUtil = __importStar(__nccwpck_require__(386)); /* eslint-disable @typescript-eslint/unbound-method */ const IS_WINDOWS = process.platform === 'win32'; /* @@ -1652,7 +1652,7 @@ class ExecState extends events.EventEmitter { /***/ }), -/***/ 714: +/***/ 569: /***/ (function(__unused_webpack_module, exports) { "use strict"; @@ -1740,7 +1740,7 @@ exports.PersonalAccessTokenCredentialHandler = PersonalAccessTokenCredentialHand /***/ }), -/***/ 422: +/***/ 803: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { "use strict"; @@ -1776,10 +1776,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }; Object.defineProperty(exports, "__esModule", ({ value: true })); exports.HttpClient = exports.isHttps = exports.HttpClientResponse = exports.HttpClientError = exports.getProxyUrl = exports.MediaTypes = exports.Headers = exports.HttpCodes = void 0; -const http = __importStar(__nccwpck_require__(685)); -const https = __importStar(__nccwpck_require__(687)); -const pm = __importStar(__nccwpck_require__(908)); -const tunnel = __importStar(__nccwpck_require__(582)); +const http = __importStar(__nccwpck_require__(611)); +const https = __importStar(__nccwpck_require__(692)); +const pm = __importStar(__nccwpck_require__(551)); +const tunnel = __importStar(__nccwpck_require__(205)); var HttpCodes; (function (HttpCodes) { HttpCodes[HttpCodes["OK"] = 200] = "OK"; @@ -2352,7 +2352,7 @@ const lowercaseKeys = (obj) => Object.keys(obj).reduce((c, k) => ((c[k.toLowerCa /***/ }), -/***/ 908: +/***/ 551: /***/ ((__unused_webpack_module, exports) => { "use strict"; @@ -2420,7 +2420,7 @@ exports.checkBypass = checkBypass; /***/ }), -/***/ 400: +/***/ 386: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { "use strict"; @@ -2436,9 +2436,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }; var _a; Object.defineProperty(exports, "__esModule", ({ value: true })); -const assert_1 = __nccwpck_require__(491); -const fs = __nccwpck_require__(147); -const path = __nccwpck_require__(17); +const assert_1 = __nccwpck_require__(613); +const fs = __nccwpck_require__(896); +const path = __nccwpck_require__(928); _a = fs.promises, exports.chmod = _a.chmod, exports.copyFile = _a.copyFile, exports.lstat = _a.lstat, exports.mkdir = _a.mkdir, exports.readdir = _a.readdir, exports.readlink = _a.readlink, exports.rename = _a.rename, exports.rmdir = _a.rmdir, exports.stat = _a.stat, exports.symlink = _a.symlink, exports.unlink = _a.unlink; exports.IS_WINDOWS = process.platform === 'win32'; function exists(fsPath) { @@ -2622,7 +2622,7 @@ function isUnixExecutable(stats) { /***/ }), -/***/ 853: +/***/ 389: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { "use strict"; @@ -2637,10 +2637,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; Object.defineProperty(exports, "__esModule", ({ value: true })); -const childProcess = __nccwpck_require__(81); -const path = __nccwpck_require__(17); -const util_1 = __nccwpck_require__(837); -const ioUtil = __nccwpck_require__(400); +const childProcess = __nccwpck_require__(317); +const path = __nccwpck_require__(928); +const util_1 = __nccwpck_require__(23); +const ioUtil = __nccwpck_require__(386); const exec = util_1.promisify(childProcess.exec); /** * Copies a file or folder. @@ -2919,7 +2919,7 @@ function copyFile(srcFile, destFile, force) { /***/ }), -/***/ 410: +/***/ 772: /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => { /*! @@ -2929,8 +2929,8 @@ function copyFile(srcFile, destFile, force) { * Licensed under the MIT license. */ -var homedir = __nccwpck_require__(263); -var path = __nccwpck_require__(17); +var homedir = __nccwpck_require__(401); +var path = __nccwpck_require__(928); module.exports = function expandTilde(filepath) { var home = homedir(); @@ -2948,31 +2948,31 @@ module.exports = function expandTilde(filepath) { /***/ }), -/***/ 263: +/***/ 401: /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => { "use strict"; -var os = __nccwpck_require__(37); +var os = __nccwpck_require__(857); if (typeof os.homedir !== 'undefined') { module.exports = os.homedir; } else { - module.exports = __nccwpck_require__(389); + module.exports = __nccwpck_require__(142); } /***/ }), -/***/ 389: +/***/ 142: /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => { "use strict"; -var fs = __nccwpck_require__(147); -var parse = __nccwpck_require__(438); +var fs = __nccwpck_require__(896); +var parse = __nccwpck_require__(187); function homedir() { // The following logic is from looking at logic used in the different platform @@ -3054,7 +3054,7 @@ module.exports = homedir; /***/ }), -/***/ 438: +/***/ 187: /***/ ((module) => { "use strict"; @@ -3118,27 +3118,27 @@ function user(line, i) { /***/ }), -/***/ 582: +/***/ 205: /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => { -module.exports = __nccwpck_require__(839); +module.exports = __nccwpck_require__(999); /***/ }), -/***/ 839: +/***/ 999: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; -var net = __nccwpck_require__(808); -var tls = __nccwpck_require__(404); -var http = __nccwpck_require__(685); -var https = __nccwpck_require__(687); -var events = __nccwpck_require__(361); -var assert = __nccwpck_require__(491); -var util = __nccwpck_require__(837); +var net = __nccwpck_require__(278); +var tls = __nccwpck_require__(756); +var http = __nccwpck_require__(611); +var https = __nccwpck_require__(692); +var events = __nccwpck_require__(434); +var assert = __nccwpck_require__(613); +var util = __nccwpck_require__(23); exports.httpOverHttp = httpOverHttp; @@ -3398,7 +3398,7 @@ exports.debug = debug; // for test /***/ }), -/***/ 304: +/***/ 193: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -3462,29 +3462,29 @@ Object.defineProperty(exports, "parse", ({ } })); -var _v = _interopRequireDefault(__nccwpck_require__(472)); +var _v = _interopRequireDefault(__nccwpck_require__(356)); -var _v2 = _interopRequireDefault(__nccwpck_require__(929)); +var _v2 = _interopRequireDefault(__nccwpck_require__(174)); -var _v3 = _interopRequireDefault(__nccwpck_require__(253)); +var _v3 = _interopRequireDefault(__nccwpck_require__(327)); -var _v4 = _interopRequireDefault(__nccwpck_require__(767)); +var _v4 = _interopRequireDefault(__nccwpck_require__(176)); -var _nil = _interopRequireDefault(__nccwpck_require__(788)); +var _nil = _interopRequireDefault(__nccwpck_require__(242)); -var _version = _interopRequireDefault(__nccwpck_require__(707)); +var _version = _interopRequireDefault(__nccwpck_require__(761)); -var _validate = _interopRequireDefault(__nccwpck_require__(840)); +var _validate = _interopRequireDefault(__nccwpck_require__(67)); -var _stringify = _interopRequireDefault(__nccwpck_require__(641)); +var _stringify = _interopRequireDefault(__nccwpck_require__(568)); -var _parse = _interopRequireDefault(__nccwpck_require__(534)); +var _parse = _interopRequireDefault(__nccwpck_require__(550)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } /***/ }), -/***/ 832: +/***/ 461: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -3495,7 +3495,7 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _crypto = _interopRequireDefault(__nccwpck_require__(113)); +var _crypto = _interopRequireDefault(__nccwpck_require__(982)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -3514,7 +3514,7 @@ exports["default"] = _default; /***/ }), -/***/ 788: +/***/ 242: /***/ ((__unused_webpack_module, exports) => { "use strict"; @@ -3529,7 +3529,7 @@ exports["default"] = _default; /***/ }), -/***/ 534: +/***/ 550: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -3540,7 +3540,7 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _validate = _interopRequireDefault(__nccwpck_require__(840)); +var _validate = _interopRequireDefault(__nccwpck_require__(67)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -3581,7 +3581,7 @@ exports["default"] = _default; /***/ }), -/***/ 811: +/***/ 358: /***/ ((__unused_webpack_module, exports) => { "use strict"; @@ -3596,7 +3596,7 @@ exports["default"] = _default; /***/ }), -/***/ 516: +/***/ 428: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -3607,7 +3607,7 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = rng; -var _crypto = _interopRequireDefault(__nccwpck_require__(113)); +var _crypto = _interopRequireDefault(__nccwpck_require__(982)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -3627,7 +3627,7 @@ function rng() { /***/ }), -/***/ 532: +/***/ 624: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -3638,7 +3638,7 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _crypto = _interopRequireDefault(__nccwpck_require__(113)); +var _crypto = _interopRequireDefault(__nccwpck_require__(982)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -3657,7 +3657,7 @@ exports["default"] = _default; /***/ }), -/***/ 641: +/***/ 568: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -3668,7 +3668,7 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _validate = _interopRequireDefault(__nccwpck_require__(840)); +var _validate = _interopRequireDefault(__nccwpck_require__(67)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -3703,7 +3703,7 @@ exports["default"] = _default; /***/ }), -/***/ 472: +/***/ 356: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -3714,9 +3714,9 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _rng = _interopRequireDefault(__nccwpck_require__(516)); +var _rng = _interopRequireDefault(__nccwpck_require__(428)); -var _stringify = _interopRequireDefault(__nccwpck_require__(641)); +var _stringify = _interopRequireDefault(__nccwpck_require__(568)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -3817,7 +3817,7 @@ exports["default"] = _default; /***/ }), -/***/ 929: +/***/ 174: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -3828,9 +3828,9 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _v = _interopRequireDefault(__nccwpck_require__(640)); +var _v = _interopRequireDefault(__nccwpck_require__(311)); -var _md = _interopRequireDefault(__nccwpck_require__(832)); +var _md = _interopRequireDefault(__nccwpck_require__(461)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -3840,7 +3840,7 @@ exports["default"] = _default; /***/ }), -/***/ 640: +/***/ 311: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -3852,9 +3852,9 @@ Object.defineProperty(exports, "__esModule", ({ exports["default"] = _default; exports.URL = exports.DNS = void 0; -var _stringify = _interopRequireDefault(__nccwpck_require__(641)); +var _stringify = _interopRequireDefault(__nccwpck_require__(568)); -var _parse = _interopRequireDefault(__nccwpck_require__(534)); +var _parse = _interopRequireDefault(__nccwpck_require__(550)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -3925,7 +3925,7 @@ function _default(name, version, hashfunc) { /***/ }), -/***/ 253: +/***/ 327: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -3936,9 +3936,9 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _rng = _interopRequireDefault(__nccwpck_require__(516)); +var _rng = _interopRequireDefault(__nccwpck_require__(428)); -var _stringify = _interopRequireDefault(__nccwpck_require__(641)); +var _stringify = _interopRequireDefault(__nccwpck_require__(568)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -3969,7 +3969,7 @@ exports["default"] = _default; /***/ }), -/***/ 767: +/***/ 176: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -3980,9 +3980,9 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _v = _interopRequireDefault(__nccwpck_require__(640)); +var _v = _interopRequireDefault(__nccwpck_require__(311)); -var _sha = _interopRequireDefault(__nccwpck_require__(532)); +var _sha = _interopRequireDefault(__nccwpck_require__(624)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -3992,7 +3992,7 @@ exports["default"] = _default; /***/ }), -/***/ 840: +/***/ 67: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -4003,7 +4003,7 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _regex = _interopRequireDefault(__nccwpck_require__(811)); +var _regex = _interopRequireDefault(__nccwpck_require__(358)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -4016,7 +4016,7 @@ exports["default"] = _default; /***/ }), -/***/ 707: +/***/ 761: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -4027,7 +4027,7 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _validate = _interopRequireDefault(__nccwpck_require__(840)); +var _validate = _interopRequireDefault(__nccwpck_require__(67)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -4044,7 +4044,7 @@ exports["default"] = _default; /***/ }), -/***/ 491: +/***/ 613: /***/ ((module) => { "use strict"; @@ -4052,7 +4052,7 @@ module.exports = require("assert"); /***/ }), -/***/ 81: +/***/ 317: /***/ ((module) => { "use strict"; @@ -4060,7 +4060,7 @@ module.exports = require("child_process"); /***/ }), -/***/ 113: +/***/ 982: /***/ ((module) => { "use strict"; @@ -4068,7 +4068,7 @@ module.exports = require("crypto"); /***/ }), -/***/ 361: +/***/ 434: /***/ ((module) => { "use strict"; @@ -4076,7 +4076,7 @@ module.exports = require("events"); /***/ }), -/***/ 147: +/***/ 896: /***/ ((module) => { "use strict"; @@ -4084,7 +4084,7 @@ module.exports = require("fs"); /***/ }), -/***/ 685: +/***/ 611: /***/ ((module) => { "use strict"; @@ -4092,7 +4092,7 @@ module.exports = require("http"); /***/ }), -/***/ 687: +/***/ 692: /***/ ((module) => { "use strict"; @@ -4100,7 +4100,7 @@ module.exports = require("https"); /***/ }), -/***/ 808: +/***/ 278: /***/ ((module) => { "use strict"; @@ -4108,7 +4108,7 @@ module.exports = require("net"); /***/ }), -/***/ 37: +/***/ 857: /***/ ((module) => { "use strict"; @@ -4116,7 +4116,7 @@ module.exports = require("os"); /***/ }), -/***/ 17: +/***/ 928: /***/ ((module) => { "use strict"; @@ -4124,7 +4124,7 @@ module.exports = require("path"); /***/ }), -/***/ 404: +/***/ 756: /***/ ((module) => { "use strict"; @@ -4132,7 +4132,7 @@ module.exports = require("tls"); /***/ }), -/***/ 837: +/***/ 23: /***/ ((module) => { "use strict"; @@ -4179,8 +4179,6 @@ module.exports = require("util"); /******/ /************************************************************************/ var __webpack_exports__ = {}; -// This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk. -(() => { // (C) Copyright 2020 Enthought, Inc., Austin, TX // All rights reserved. // @@ -4191,11 +4189,11 @@ var __webpack_exports__ = {}; // // Thanks for using Enthought open source! -const core = __nccwpck_require__(519) -const exec = __nccwpck_require__(372) -const fs = __nccwpck_require__(147) -const path = __nccwpck_require__(17) -const expandTilde = __nccwpck_require__(410) +const core = __nccwpck_require__(195) +const exec = __nccwpck_require__(787) +const fs = __nccwpck_require__(896) +const path = __nccwpck_require__(928) +const expandTilde = __nccwpck_require__(772) // EDM Version, e.g. '3.7.0' const edmVersion = core.getInput('edm-version', { required: true }); @@ -4284,8 +4282,6 @@ async function installEdmWindows() { main(); -})(); - module.exports = __webpack_exports__; /******/ })() ; \ No newline at end of file diff --git a/dist/install-edm-linux.sh b/dist/install-edm-linux.sh index 4082c7e..0dfab76 100755 --- a/dist/install-edm-linux.sh +++ b/dist/install-edm-linux.sh @@ -22,12 +22,21 @@ INSTALL_EDM_VERSION=$1 DOWNLOAD_DIR=$2 install_edm() { + local EDM_MAJOR="$(echo "$INSTALL_EDM_VERSION" | sed -E -e 's/([[:digit:]]+)\..*/\1/')" local EDM_MAJOR_MINOR="$(echo "$INSTALL_EDM_VERSION" | sed -E -e 's/([[:digit:]]+\.[[:digit:]]+)\..*/\1/')" local EDM_PACKAGE="edm_cli_${INSTALL_EDM_VERSION}_linux_x86_64.sh" local EDM_INSTALLER_PATH="${DOWNLOAD_DIR}/${EDM_PACKAGE}" + # Use rh8 for version 4.0.0 and later, otherwise use rh6 + if [ "$EDM_MAJOR" -gt "3" ]; then + local EDM_URL="https://package-data.enthought.com/edm/rh8_x86_64/${EDM_MAJOR_MINOR}/${EDM_PACKAGE}" + else + local EDM_URL="https://package-data.enthought.com/edm/rh6_x86_64/${EDM_MAJOR_MINOR}/${EDM_PACKAGE}" + fi + + echo "$EDM_URL" if [ ! -e "$EDM_INSTALLER_PATH" ]; then - curl --fail --show-error -o "$EDM_INSTALLER_PATH" -L "https://package-data.enthought.com/edm/rh6_x86_64/${EDM_MAJOR_MINOR}/${EDM_PACKAGE}" + curl --fail --show-error -o "$EDM_INSTALLER_PATH" -L "$EDM_URL" fi bash "$EDM_INSTALLER_PATH" -b -p "${HOME}/edm" diff --git a/dist/install-edm-osx.sh b/dist/install-edm-osx.sh index 89b20e7..ad32ecd 100755 --- a/dist/install-edm-osx.sh +++ b/dist/install-edm-osx.sh @@ -25,6 +25,8 @@ install_edm() { local EDM_PACKAGE="edm_cli_${INSTALL_EDM_VERSION}.pkg" local EDM_INSTALLER_PATH="${DOWNLOAD_DIR}/${EDM_PACKAGE}" + echo "https://package-data.enthought.com/edm/osx_x86_64/${EDM_MAJOR_MINOR}/${EDM_PACKAGE}" + if [ ! -e "$EDM_INSTALLER_PATH" ]; then curl --fail --show-error -o "$EDM_INSTALLER_PATH" -L "https://package-data.enthought.com/edm/osx_x86_64/${EDM_MAJOR_MINOR}/${EDM_PACKAGE}" fi diff --git a/src/install-edm-linux.sh b/src/install-edm-linux.sh index 4082c7e..0dfab76 100755 --- a/src/install-edm-linux.sh +++ b/src/install-edm-linux.sh @@ -22,12 +22,21 @@ INSTALL_EDM_VERSION=$1 DOWNLOAD_DIR=$2 install_edm() { + local EDM_MAJOR="$(echo "$INSTALL_EDM_VERSION" | sed -E -e 's/([[:digit:]]+)\..*/\1/')" local EDM_MAJOR_MINOR="$(echo "$INSTALL_EDM_VERSION" | sed -E -e 's/([[:digit:]]+\.[[:digit:]]+)\..*/\1/')" local EDM_PACKAGE="edm_cli_${INSTALL_EDM_VERSION}_linux_x86_64.sh" local EDM_INSTALLER_PATH="${DOWNLOAD_DIR}/${EDM_PACKAGE}" + # Use rh8 for version 4.0.0 and later, otherwise use rh6 + if [ "$EDM_MAJOR" -gt "3" ]; then + local EDM_URL="https://package-data.enthought.com/edm/rh8_x86_64/${EDM_MAJOR_MINOR}/${EDM_PACKAGE}" + else + local EDM_URL="https://package-data.enthought.com/edm/rh6_x86_64/${EDM_MAJOR_MINOR}/${EDM_PACKAGE}" + fi + + echo "$EDM_URL" if [ ! -e "$EDM_INSTALLER_PATH" ]; then - curl --fail --show-error -o "$EDM_INSTALLER_PATH" -L "https://package-data.enthought.com/edm/rh6_x86_64/${EDM_MAJOR_MINOR}/${EDM_PACKAGE}" + curl --fail --show-error -o "$EDM_INSTALLER_PATH" -L "$EDM_URL" fi bash "$EDM_INSTALLER_PATH" -b -p "${HOME}/edm" diff --git a/src/install-edm-osx.sh b/src/install-edm-osx.sh index 89b20e7..ad32ecd 100755 --- a/src/install-edm-osx.sh +++ b/src/install-edm-osx.sh @@ -25,6 +25,8 @@ install_edm() { local EDM_PACKAGE="edm_cli_${INSTALL_EDM_VERSION}.pkg" local EDM_INSTALLER_PATH="${DOWNLOAD_DIR}/${EDM_PACKAGE}" + echo "https://package-data.enthought.com/edm/osx_x86_64/${EDM_MAJOR_MINOR}/${EDM_PACKAGE}" + if [ ! -e "$EDM_INSTALLER_PATH" ]; then curl --fail --show-error -o "$EDM_INSTALLER_PATH" -L "https://package-data.enthought.com/edm/osx_x86_64/${EDM_MAJOR_MINOR}/${EDM_PACKAGE}" fi