From 070791aab73b96ab166e572b2e4a0f056c410394 Mon Sep 17 00:00:00 2001 From: MSP-Greg Date: Wed, 6 Sep 2023 21:08:58 -0500 Subject: [PATCH] Bump actions/checkout from 3 to 4 (#31) * Bump actions/checkout from 3 to 4 * ruby.yml - update Actions image/os list, Windows openssl, misc * Update OpenSSL install on Windows 2019, yarn/ncc --- .github/workflows/ruby.yml | 51 ++------ dist/index.js | 262 ++++++++++++++++++++++--------------- dist/package.json | 7 +- mingw.js | 16 ++- package.json | 7 +- yarn.lock | 13 +- 6 files changed, 186 insertions(+), 170 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index fcb811d..f58350c 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -20,12 +20,14 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-20.04, ubuntu-18.04, macos-11, macos-10.15 ] - ruby: [ ruby-head, 3.1, '3.0', 2.7, 2.5, 2.2, jruby, truffleruby ] + os: [ ubuntu-22.04, ubuntu-20.04, macos-13, macos-12, macos-11 ] + ruby: [ ruby-head, 3.2, 3.1, '3.0', 2.7, 2.5, 2.2, jruby, truffleruby ] + exclude: + - { os: ubuntu-22.04 , ruby: 2.2 } runs-on: ${{ matrix.os }} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Ruby Install uses: ./ @@ -39,14 +41,13 @@ jobs: ruby -v echo '' gcc --version - echo '' openssl version echo '' ragel --version echo '' bundler version echo '' - gem --version + echo "RubyGems $(gem --version)" win32: name: >- @@ -54,12 +55,12 @@ jobs: strategy: fail-fast: false matrix: - os: [ windows-2019, windows-2022 ] - ruby: [ mswin, mingw, ucrt, head, 3.1, '3.0', 2.5, 2.4, 2.3, 2.2 ] + os: [ windows-2022, windows-2019 ] + ruby: [ mswin, mingw, ucrt, head, 3.2, 3.1, '3.0', 2.5, 2.4, 2.3, 2.2 ] runs-on: ${{ matrix.os }} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Ruby Install uses: ./ @@ -94,35 +95,7 @@ jobs: timeout-minutes: 5 - name: gem install openssl - if: ((matrix.ruby >= '2.4') && (matrix.ruby <= '3.2')) || (matrix.ruby == 'head') + if: | + ((matrix.ruby >= '2.5') && (matrix.os == 'windows-2019')) + || ((matrix.ruby >= '2.4') && (matrix.os >= 'windows-2022')) run: gem install openssl -N - - plus: - name: >- - plus ${{ matrix.os }} ${{ matrix.ruby }} - strategy: - fail-fast: false - matrix: - os: [ ubuntu-20.04, macos-11 ] - ruby: [ '3.0' ] - runs-on: ${{ matrix.os }} - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Ruby Install - uses: ./ - with: - ruby-version: ${{ matrix.ruby }} - apt-get: g++ - brew: libxml++3 - - - name: Info - run: | - ruby -v - echo '' - gcc --version - echo '' - bundler version - echo '' - gem --version diff --git a/dist/index.js b/dist/index.js index c82bb15..bf1eab6 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1,7 +1,7 @@ /******/ (() => { // webpackBootstrap /******/ var __webpack_modules__ = ({ -/***/ 971: +/***/ 931: /***/ ((__unused_webpack_module, __webpack_exports__, __nccwpck_require__) => { "use strict"; @@ -11,9 +11,9 @@ __nccwpck_require__.r(__webpack_exports__); /* harmony export */ }); -const core = __nccwpck_require__(186) +const core = __nccwpck_require__(651) -const { execSync, grpSt, grpEnd, getInput } = __nccwpck_require__(390) +const { execSync, grpSt, grpEnd, getInput } = __nccwpck_require__(793) // group start time let msSt @@ -77,7 +77,7 @@ const run = async () => { /***/ }), -/***/ 423: +/***/ 543: /***/ ((__unused_webpack_module, __webpack_exports__, __nccwpck_require__) => { "use strict"; @@ -87,9 +87,9 @@ __nccwpck_require__.r(__webpack_exports__); /* harmony export */ }); -const core = __nccwpck_require__(186) +const core = __nccwpck_require__(651) -const { execSync, grpSt, grpEnd } = __nccwpck_require__(390) +const { execSync, grpSt, grpEnd } = __nccwpck_require__(793) // group start time let msSt @@ -133,32 +133,32 @@ const run = async () => { /***/ }), -/***/ 390: +/***/ 793: /***/ ((__unused_webpack_module, __webpack_exports__, __nccwpck_require__) => { "use strict"; __nccwpck_require__.r(__webpack_exports__); /* harmony export */ __nccwpck_require__.d(__webpack_exports__, { -/* harmony export */ "is2022orLater": () => (/* binding */ is2022orLater), -/* harmony export */ "version": () => (/* binding */ version), /* harmony export */ "download": () => (/* binding */ download), -/* harmony export */ "ruby": () => (/* binding */ ruby), /* harmony export */ "execSync": () => (/* binding */ execSync), /* harmony export */ "execSyncQ": () => (/* binding */ execSyncQ), -/* harmony export */ "grpSt": () => (/* binding */ grpSt), +/* harmony export */ "getInput": () => (/* binding */ getInput), /* harmony export */ "grpEnd": () => (/* binding */ grpEnd), +/* harmony export */ "grpSt": () => (/* binding */ grpSt), +/* harmony export */ "is2022orLater": () => (/* binding */ is2022orLater), /* harmony export */ "log": () => (/* binding */ log), -/* harmony export */ "getInput": () => (/* binding */ getInput), -/* harmony export */ "win2nix": () => (/* binding */ win2nix), -/* harmony export */ "updateKeyRing": () => (/* binding */ updateKeyRing) +/* harmony export */ "ruby": () => (/* binding */ ruby), +/* harmony export */ "updateKeyRing": () => (/* binding */ updateKeyRing), +/* harmony export */ "version": () => (/* binding */ version), +/* harmony export */ "win2nix": () => (/* binding */ win2nix) /* harmony export */ }); const cp = __nccwpck_require__(81) const fs = __nccwpck_require__(147) const path = __nccwpck_require__(17) -const core = __nccwpck_require__(186) -const httpc = __nccwpck_require__(255) +const core = __nccwpck_require__(651) +const httpc = __nccwpck_require__(79) const { performance } = __nccwpck_require__(74) @@ -283,22 +283,22 @@ const updateKeyRing = async (vers) => { /***/ }), -/***/ 162: +/***/ 440: /***/ ((__unused_webpack_module, __webpack_exports__, __nccwpck_require__) => { "use strict"; __nccwpck_require__.r(__webpack_exports__); /* harmony export */ __nccwpck_require__.d(__webpack_exports__, { -/* harmony export */ "setRuby": () => (/* binding */ setRuby), -/* harmony export */ "run": () => (/* binding */ run) +/* harmony export */ "run": () => (/* binding */ run), +/* harmony export */ "setRuby": () => (/* binding */ setRuby) /* harmony export */ }); const fs = __nccwpck_require__(147) -const core = __nccwpck_require__(186) +const core = __nccwpck_require__(651) // , updateKeyRing -const { download, execSync, execSyncQ, grpSt, grpEnd, getInput, is2022orLater, win2nix } = __nccwpck_require__(390) +const { download, execSync, execSyncQ, grpSt, grpEnd, getInput, is2022orLater, win2nix } = __nccwpck_require__(793) // group start time let msSt @@ -370,9 +370,9 @@ const openssl = async () => { }) if (ruby.abiVers === '2.4.0') { + msSt = grpSt('install 2.4 OpenSSL 1.0.2') let uri = 'https://github.com/MSP-Greg/ruby-loco/releases/download/old-ruby/mingw-w64-x86_64-openssl-1.0.2.u-1-any.pkg.tar.zst' let fn = `${dlPath}\\ri2.tar.zst` - msSt = grpSt('install 2.4 OpenSSL') // appveyor ri2 package signing key // let key = 'F98B8484BE8BF1C5' @@ -385,9 +385,19 @@ const openssl = async () => { execSync(`pacman.exe -Udd --noconfirm --noprogressbar ${fn}`) grpEnd(msSt) mingwPkgs = mingwPkgs.replace(/\bopenssl\b/gi, '').trim() - } else if ((is2022orLater && ruby.abiVers >= '2.5.0') || core.getInput('ruby-version') === 'head') - // Ruby 'head' uses a custom OpenSSL 3 package + } else if (!is2022orLater && ruby.abiVers >= '2.5.0' && ruby.abiVers < '3.1.0') { + msSt = grpSt('install OpenSSL 1.1.1.t') + let uri = `https://github.com/ruby/setup-msys2-gcc/releases/download/msys2-packages/${pre.trim()}openssl-1.1.1.t-1-any.pkg.tar.zst` + let fn = `${dlPath}\\ri2.tar.zst` + await download(uri, fn) + checkSpace + execSync(`pacman.exe -Udd --noconfirm --noprogressbar ${fn}`) + grpEnd(msSt) mingwPkgs = mingwPkgs.replace(/\bopenssl\b/gi, '').trim() + } else if ((is2022orLater && ruby.abiVers >= '2.5.0') || (!is2022orLater && ruby.abiVers >= '3.1.0')) { + // already installed by setup-ruby + mingwPkgs = mingwPkgs.replace(/\bopenssl\b/gi, '').trim() + } } // Updates MSYS2 MinGW gcc items @@ -446,7 +456,7 @@ const runMingw = async () => { * when using an installed mingw Ruby, normally _upgrade_ should be used */ if (mingwPkgs.includes('_msvc_')) { - await (__nccwpck_require__(270).addVCVARSEnv)() + await (__nccwpck_require__(550).addVCVARSEnv)() return } @@ -563,7 +573,7 @@ const run = async () => { } else { // get list of available pkgs for Ruby 2.2 & 2.3 - old_pkgs = (__nccwpck_require__(91)/* .old_pkgs */ .c) + old_pkgs = (__nccwpck_require__(982)/* .old_pkgs */ .c) } // install user specificied packages @@ -587,22 +597,22 @@ const run = async () => { /***/ }), -/***/ 270: +/***/ 550: /***/ ((__unused_webpack_module, __webpack_exports__, __nccwpck_require__) => { "use strict"; __nccwpck_require__.r(__webpack_exports__); /* harmony export */ __nccwpck_require__.d(__webpack_exports__, { -/* harmony export */ "setRuby": () => (/* binding */ setRuby), -/* harmony export */ "run": () => (/* binding */ run) +/* harmony export */ "run": () => (/* binding */ run), +/* harmony export */ "setRuby": () => (/* binding */ setRuby) /* harmony export */ }); const fs = __nccwpck_require__(147) -const core = __nccwpck_require__(186) +const core = __nccwpck_require__(651) // , updateKeyRing -const { execSync, grpSt, grpEnd, getInput } = __nccwpck_require__(390) +const { execSync, grpSt, grpEnd, getInput } = __nccwpck_require__(793) // group start time let msSt @@ -676,7 +686,7 @@ const run = async () => { /***/ }), -/***/ 351: +/***/ 937: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { "use strict"; @@ -703,7 +713,7 @@ 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__(278); +const utils_1 = __nccwpck_require__(919); /** * Commands * @@ -775,7 +785,7 @@ function escapeProperty(s) { /***/ }), -/***/ 186: +/***/ 651: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { "use strict"; @@ -810,12 +820,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__(351); -const file_command_1 = __nccwpck_require__(717); -const utils_1 = __nccwpck_require__(278); +const command_1 = __nccwpck_require__(937); +const file_command_1 = __nccwpck_require__(592); +const utils_1 = __nccwpck_require__(919); const os = __importStar(__nccwpck_require__(37)); const path = __importStar(__nccwpck_require__(17)); -const oidc_utils_1 = __nccwpck_require__(41); +const oidc_utils_1 = __nccwpck_require__(218); /** * The code to exit an action */ @@ -1100,17 +1110,17 @@ exports.getIDToken = getIDToken; /** * Summary exports */ -var summary_1 = __nccwpck_require__(327); +var summary_1 = __nccwpck_require__(444); Object.defineProperty(exports, "summary", ({ enumerable: true, get: function () { return summary_1.summary; } })); /** * @deprecated use core.summary */ -var summary_2 = __nccwpck_require__(327); +var summary_2 = __nccwpck_require__(444); Object.defineProperty(exports, "markdownSummary", ({ enumerable: true, get: function () { return summary_2.markdownSummary; } })); /** * Path exports */ -var path_utils_1 = __nccwpck_require__(981); +var path_utils_1 = __nccwpck_require__(45); 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; } })); @@ -1118,7 +1128,7 @@ Object.defineProperty(exports, "toPlatformPath", ({ enumerable: true, get: funct /***/ }), -/***/ 717: +/***/ 592: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { "use strict"; @@ -1149,8 +1159,8 @@ exports.prepareKeyValueMessage = exports.issueFileCommand = void 0; /* eslint-disable @typescript-eslint/no-explicit-any */ const fs = __importStar(__nccwpck_require__(147)); const os = __importStar(__nccwpck_require__(37)); -const uuid_1 = __nccwpck_require__(840); -const utils_1 = __nccwpck_require__(278); +const uuid_1 = __nccwpck_require__(473); +const utils_1 = __nccwpck_require__(919); function issueFileCommand(command, message) { const filePath = process.env[`GITHUB_${command}`]; if (!filePath) { @@ -1183,7 +1193,7 @@ exports.prepareKeyValueMessage = prepareKeyValueMessage; /***/ }), -/***/ 41: +/***/ 218: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { "use strict"; @@ -1199,9 +1209,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__(255); -const auth_1 = __nccwpck_require__(526); -const core_1 = __nccwpck_require__(186); +const http_client_1 = __nccwpck_require__(79); +const auth_1 = __nccwpck_require__(581); +const core_1 = __nccwpck_require__(651); class OidcClient { static createHttpClient(allowRetry = true, maxRetry = 10) { const requestOptions = { @@ -1267,7 +1277,7 @@ exports.OidcClient = OidcClient; /***/ }), -/***/ 981: +/***/ 45: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { "use strict"; @@ -1332,7 +1342,7 @@ exports.toPlatformPath = toPlatformPath; /***/ }), -/***/ 327: +/***/ 444: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { "use strict"; @@ -1622,7 +1632,7 @@ exports.summary = _summary; /***/ }), -/***/ 278: +/***/ 919: /***/ ((__unused_webpack_module, exports) => { "use strict"; @@ -1669,7 +1679,7 @@ exports.toCommandProperties = toCommandProperties; /***/ }), -/***/ 526: +/***/ 581: /***/ (function(__unused_webpack_module, exports) { "use strict"; @@ -1757,7 +1767,7 @@ exports.PersonalAccessTokenCredentialHandler = PersonalAccessTokenCredentialHand /***/ }), -/***/ 255: +/***/ 79: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { "use strict"; @@ -1794,9 +1804,9 @@ 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__(835)); -const tunnel = __importStar(__nccwpck_require__(294)); +const https = __importStar(__nccwpck_require__(241)); +const pm = __importStar(__nccwpck_require__(353)); +const tunnel = __importStar(__nccwpck_require__(447)); var HttpCodes; (function (HttpCodes) { HttpCodes[HttpCodes["OK"] = 200] = "OK"; @@ -1886,6 +1896,19 @@ class HttpClientResponse { })); }); } + readBodyBuffer() { + return __awaiter(this, void 0, void 0, function* () { + return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () { + const chunks = []; + this.message.on('data', (chunk) => { + chunks.push(chunk); + }); + this.message.on('end', () => { + resolve(Buffer.concat(chunks)); + }); + })); + }); + } } exports.HttpClientResponse = HttpClientResponse; function isHttps(requestUrl) { @@ -2369,7 +2392,7 @@ const lowercaseKeys = (obj) => Object.keys(obj).reduce((c, k) => ((c[k.toLowerCa /***/ }), -/***/ 835: +/***/ 353: /***/ ((__unused_webpack_module, exports) => { "use strict"; @@ -2390,7 +2413,13 @@ function getProxyUrl(reqUrl) { } })(); if (proxyVar) { - return new URL(proxyVar); + try { + return new URL(proxyVar); + } + catch (_a) { + if (!proxyVar.startsWith('http://') && !proxyVar.startsWith('https://')) + return new URL(`http://${proxyVar}`); + } } else { return undefined; @@ -2401,6 +2430,10 @@ function checkBypass(reqUrl) { if (!reqUrl.hostname) { return false; } + const reqHost = reqUrl.hostname; + if (isLoopbackAddress(reqHost)) { + return true; + } const noProxy = process.env['no_proxy'] || process.env['NO_PROXY'] || ''; if (!noProxy) { return false; @@ -2426,26 +2459,37 @@ function checkBypass(reqUrl) { .split(',') .map(x => x.trim().toUpperCase()) .filter(x => x)) { - if (upperReqHosts.some(x => x === upperNoProxyItem)) { + if (upperNoProxyItem === '*' || + upperReqHosts.some(x => x === upperNoProxyItem || + x.endsWith(`.${upperNoProxyItem}`) || + (upperNoProxyItem.startsWith('.') && + x.endsWith(`${upperNoProxyItem}`)))) { return true; } } return false; } exports.checkBypass = checkBypass; +function isLoopbackAddress(host) { + const hostLower = host.toLowerCase(); + return (hostLower === 'localhost' || + hostLower.startsWith('127.') || + hostLower.startsWith('[::1]') || + hostLower.startsWith('[0:0:0:0:0:0:0:1]')); +} //# sourceMappingURL=proxy.js.map /***/ }), -/***/ 294: +/***/ 447: /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => { -module.exports = __nccwpck_require__(219); +module.exports = __nccwpck_require__(337); /***/ }), -/***/ 219: +/***/ 337: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -2454,7 +2498,7 @@ module.exports = __nccwpck_require__(219); var net = __nccwpck_require__(808); var tls = __nccwpck_require__(404); var http = __nccwpck_require__(685); -var https = __nccwpck_require__(687); +var https = __nccwpck_require__(241); var events = __nccwpck_require__(361); var assert = __nccwpck_require__(491); var util = __nccwpck_require__(837); @@ -2717,7 +2761,7 @@ exports.debug = debug; // for test /***/ }), -/***/ 840: +/***/ 473: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -2781,29 +2825,29 @@ Object.defineProperty(exports, "parse", ({ } })); -var _v = _interopRequireDefault(__nccwpck_require__(628)); +var _v = _interopRequireDefault(__nccwpck_require__(317)); -var _v2 = _interopRequireDefault(__nccwpck_require__(409)); +var _v2 = _interopRequireDefault(__nccwpck_require__(912)); -var _v3 = _interopRequireDefault(__nccwpck_require__(122)); +var _v3 = _interopRequireDefault(__nccwpck_require__(861)); -var _v4 = _interopRequireDefault(__nccwpck_require__(120)); +var _v4 = _interopRequireDefault(__nccwpck_require__(75)); -var _nil = _interopRequireDefault(__nccwpck_require__(332)); +var _nil = _interopRequireDefault(__nccwpck_require__(143)); -var _version = _interopRequireDefault(__nccwpck_require__(595)); +var _version = _interopRequireDefault(__nccwpck_require__(941)); -var _validate = _interopRequireDefault(__nccwpck_require__(900)); +var _validate = _interopRequireDefault(__nccwpck_require__(687)); -var _stringify = _interopRequireDefault(__nccwpck_require__(950)); +var _stringify = _interopRequireDefault(__nccwpck_require__(248)); -var _parse = _interopRequireDefault(__nccwpck_require__(746)); +var _parse = _interopRequireDefault(__nccwpck_require__(177)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } /***/ }), -/***/ 569: +/***/ 987: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -2833,7 +2877,7 @@ exports["default"] = _default; /***/ }), -/***/ 332: +/***/ 143: /***/ ((__unused_webpack_module, exports) => { "use strict"; @@ -2848,7 +2892,7 @@ exports["default"] = _default; /***/ }), -/***/ 746: +/***/ 177: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -2859,7 +2903,7 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _validate = _interopRequireDefault(__nccwpck_require__(900)); +var _validate = _interopRequireDefault(__nccwpck_require__(687)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -2900,7 +2944,7 @@ exports["default"] = _default; /***/ }), -/***/ 814: +/***/ 225: /***/ ((__unused_webpack_module, exports) => { "use strict"; @@ -2915,7 +2959,7 @@ exports["default"] = _default; /***/ }), -/***/ 807: +/***/ 818: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -2946,7 +2990,7 @@ function rng() { /***/ }), -/***/ 274: +/***/ 619: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -2976,7 +3020,7 @@ exports["default"] = _default; /***/ }), -/***/ 950: +/***/ 248: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -2987,7 +3031,7 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _validate = _interopRequireDefault(__nccwpck_require__(900)); +var _validate = _interopRequireDefault(__nccwpck_require__(687)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -3022,7 +3066,7 @@ exports["default"] = _default; /***/ }), -/***/ 628: +/***/ 317: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -3033,9 +3077,9 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _rng = _interopRequireDefault(__nccwpck_require__(807)); +var _rng = _interopRequireDefault(__nccwpck_require__(818)); -var _stringify = _interopRequireDefault(__nccwpck_require__(950)); +var _stringify = _interopRequireDefault(__nccwpck_require__(248)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -3136,7 +3180,7 @@ exports["default"] = _default; /***/ }), -/***/ 409: +/***/ 912: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -3147,9 +3191,9 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _v = _interopRequireDefault(__nccwpck_require__(998)); +var _v = _interopRequireDefault(__nccwpck_require__(439)); -var _md = _interopRequireDefault(__nccwpck_require__(569)); +var _md = _interopRequireDefault(__nccwpck_require__(987)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -3159,7 +3203,7 @@ exports["default"] = _default; /***/ }), -/***/ 998: +/***/ 439: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -3171,9 +3215,9 @@ Object.defineProperty(exports, "__esModule", ({ exports["default"] = _default; exports.URL = exports.DNS = void 0; -var _stringify = _interopRequireDefault(__nccwpck_require__(950)); +var _stringify = _interopRequireDefault(__nccwpck_require__(248)); -var _parse = _interopRequireDefault(__nccwpck_require__(746)); +var _parse = _interopRequireDefault(__nccwpck_require__(177)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -3244,7 +3288,7 @@ function _default(name, version, hashfunc) { /***/ }), -/***/ 122: +/***/ 861: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -3255,9 +3299,9 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _rng = _interopRequireDefault(__nccwpck_require__(807)); +var _rng = _interopRequireDefault(__nccwpck_require__(818)); -var _stringify = _interopRequireDefault(__nccwpck_require__(950)); +var _stringify = _interopRequireDefault(__nccwpck_require__(248)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -3288,7 +3332,7 @@ exports["default"] = _default; /***/ }), -/***/ 120: +/***/ 75: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -3299,9 +3343,9 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _v = _interopRequireDefault(__nccwpck_require__(998)); +var _v = _interopRequireDefault(__nccwpck_require__(439)); -var _sha = _interopRequireDefault(__nccwpck_require__(274)); +var _sha = _interopRequireDefault(__nccwpck_require__(619)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -3311,7 +3355,7 @@ exports["default"] = _default; /***/ }), -/***/ 900: +/***/ 687: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -3322,7 +3366,7 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _regex = _interopRequireDefault(__nccwpck_require__(814)); +var _regex = _interopRequireDefault(__nccwpck_require__(225)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -3335,7 +3379,7 @@ exports["default"] = _default; /***/ }), -/***/ 595: +/***/ 941: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -3346,7 +3390,7 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _validate = _interopRequireDefault(__nccwpck_require__(900)); +var _validate = _interopRequireDefault(__nccwpck_require__(687)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -3363,7 +3407,7 @@ exports["default"] = _default; /***/ }), -/***/ 91: +/***/ 982: /***/ ((__unused_webpack_module, __webpack_exports__, __nccwpck_require__) => { "use strict"; @@ -3438,7 +3482,7 @@ module.exports = require("http"); /***/ }), -/***/ 687: +/***/ 241: /***/ ((module) => { "use strict"; @@ -3567,10 +3611,10 @@ var __webpack_exports__ = {}; (async () => { - const core = __nccwpck_require__(186) + const core = __nccwpck_require__(651) const { performance } = __nccwpck_require__(74) - const common = __nccwpck_require__(390) + const common = __nccwpck_require__(793) const platform = (__nccwpck_require__(37).platform)() @@ -3601,14 +3645,14 @@ var __webpack_exports__ = {}; switch (platform) { case 'linux': - runner = __nccwpck_require__(971) ; break + runner = __nccwpck_require__(931) ; break case 'darwin': - runner = __nccwpck_require__(423) ; break + runner = __nccwpck_require__(543) ; break case 'win32': ruby = common.ruby() - if ( ruby.platform.includes('mingw') ) { runner = __nccwpck_require__(162) } - else if ( ruby.platform.includes('mswin') ) { runner = __nccwpck_require__(270) } + if ( ruby.platform.includes('mingw') ) { runner = __nccwpck_require__(440) } + else if ( ruby.platform.includes('mswin') ) { runner = __nccwpck_require__(550) } if (runner) { runner.setRuby(ruby) } // pass Ruby info to runner } diff --git a/dist/package.json b/dist/package.json index 27b4101..33bf00d 100644 --- a/dist/package.json +++ b/dist/package.json @@ -1,6 +1,6 @@ { "name": "setup-ruby-pkgs", - "version": "1.32.4", + "version": "1.33.0", "description": "Install packages and update builds tools for Ruby", "main": "index.js", "scripts": { @@ -24,9 +24,6 @@ "license": "MIT", "dependencies": { "@actions/core": "^1.10.0", - "@actions/http-client": "^2.0.1" - }, - "devDependencies": { - "@vercel/ncc": "^0.34.0" + "@actions/http-client": "^2.1.1" } } diff --git a/mingw.js b/mingw.js index 2db9d46..d548354 100644 --- a/mingw.js +++ b/mingw.js @@ -76,9 +76,9 @@ const openssl = async () => { }) if (ruby.abiVers === '2.4.0') { + msSt = grpSt('install 2.4 OpenSSL 1.0.2') let uri = 'https://github.com/MSP-Greg/ruby-loco/releases/download/old-ruby/mingw-w64-x86_64-openssl-1.0.2.u-1-any.pkg.tar.zst' let fn = `${dlPath}\\ri2.tar.zst` - msSt = grpSt('install 2.4 OpenSSL') // appveyor ri2 package signing key // let key = 'F98B8484BE8BF1C5' @@ -91,9 +91,19 @@ const openssl = async () => { execSync(`pacman.exe -Udd --noconfirm --noprogressbar ${fn}`) grpEnd(msSt) mingwPkgs = mingwPkgs.replace(/\bopenssl\b/gi, '').trim() - } else if ((is2022orLater && ruby.abiVers >= '2.5.0') || core.getInput('ruby-version') === 'head') - // Ruby 'head' uses a custom OpenSSL 3 package + } else if (!is2022orLater && ruby.abiVers >= '2.5.0' && ruby.abiVers < '3.1.0') { + msSt = grpSt('install OpenSSL 1.1.1.t') + let uri = `https://github.com/ruby/setup-msys2-gcc/releases/download/msys2-packages/${pre.trim()}openssl-1.1.1.t-1-any.pkg.tar.zst` + let fn = `${dlPath}\\ri2.tar.zst` + await download(uri, fn) + checkSpace + execSync(`pacman.exe -Udd --noconfirm --noprogressbar ${fn}`) + grpEnd(msSt) + mingwPkgs = mingwPkgs.replace(/\bopenssl\b/gi, '').trim() + } else if ((is2022orLater && ruby.abiVers >= '2.5.0') || (!is2022orLater && ruby.abiVers >= '3.1.0')) { + // already installed by setup-ruby mingwPkgs = mingwPkgs.replace(/\bopenssl\b/gi, '').trim() + } } // Updates MSYS2 MinGW gcc items diff --git a/package.json b/package.json index 27b4101..33bf00d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "setup-ruby-pkgs", - "version": "1.32.4", + "version": "1.33.0", "description": "Install packages and update builds tools for Ruby", "main": "index.js", "scripts": { @@ -24,9 +24,6 @@ "license": "MIT", "dependencies": { "@actions/core": "^1.10.0", - "@actions/http-client": "^2.0.1" - }, - "devDependencies": { - "@vercel/ncc": "^0.34.0" + "@actions/http-client": "^2.1.1" } } diff --git a/yarn.lock b/yarn.lock index 2db8520..b3f2018 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10,18 +10,13 @@ "@actions/http-client" "^2.0.1" uuid "^8.3.2" -"@actions/http-client@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@actions/http-client/-/http-client-2.0.1.tgz#873f4ca98fe32f6839462a6f046332677322f99c" - integrity sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw== +"@actions/http-client@^2.0.1", "@actions/http-client@^2.1.1": + version "2.1.1" + resolved "https://registry.yarnpkg.com/@actions/http-client/-/http-client-2.1.1.tgz#a8e97699c315bed0ecaeaaeb640948470d4586a0" + integrity sha512-qhrkRMB40bbbLo7gF+0vu+X+UawOvQQqNAA/5Unx774RS8poaOhThDOG6BGmxvAnxhQnDp2BG/ZUm65xZILTpw== dependencies: tunnel "^0.0.6" -"@vercel/ncc@^0.34.0": - version "0.34.0" - resolved "https://registry.yarnpkg.com/@vercel/ncc/-/ncc-0.34.0.tgz#d0139528320e46670d949c82967044a8f66db054" - integrity sha512-G9h5ZLBJ/V57Ou9vz5hI8pda/YQX5HQszCs3AmIus3XzsmRn/0Ptic5otD3xVST8QLKk7AMk7AqpsyQGN7MZ9A== - tunnel@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"