diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml
deleted file mode 100644
index 3c84641..0000000
--- a/.github/workflows/dependabot.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: npm
- directory: "/"
- schedule:
- interval: daily
- open-pull-requests-limit: 10
- ignore:
- - dependency-name: "@actions/core"
- versions:
- - 1.2.7
- - dependency-name: "@actions/http-client"
- versions:
- - 1.0.10
- - 1.0.11
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index 5af3be9..a17fa51 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -9,8 +9,8 @@ jobs:
strategy:
fail-fast: false
matrix:
- os: [ ubuntu-20.04, ubuntu-18.04, macos-10.15 ]
- ruby: [ ruby-head, '3.0', 2.7, 2.5, 2.2, jruby, truffleruby ]
+ 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 ]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
@@ -74,6 +74,13 @@ jobs:
if ('${{ matrix.ruby }}' -ge '2.4') {
ridk version
}
+
+ - name: update RubyGems for Ruby 2.4 & 2.5
+ # Included RubyGems doesn't work with required_ruby_version
+ if: (matrix.ruby >= '2.4') && (matrix.ruby < '2.6')
+ run: gem update --system --no-document
+ timeout-minutes: 5
+
- name: gem install openssl
if: (matrix.ruby >= '2.4') && (matrix.ruby <= '3.2')
run: gem install openssl -N
diff --git a/README.md b/README.md
index e6bbe9a..cdc66eb 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
[ruby/setup-ruby]:https://github.com/ruby/setup-ruby
+[README]:https://github.com/ruby/setup-ruby/blob/master/README.md
+[action.yml]:https://github.com/ruby/setup-ruby/blob/master/action.yml
# setup-ruby-pkgs
@@ -11,28 +13,27 @@ The action's inputs are shown below:
```yaml
- uses: MSP-Greg/setup-ruby-pkgs@v1
with:
- ruby-version:
- bundler:
- apt: # Ubuntu
- brew: # macOS
- mingw: # Windows mingw / mswin
- msys2: # mingw
- mswin: # Windows mswin
- choco: # mswin
- vcpkg: # mswin
+ ruby-version: # passed to ruby/setup-ruby
+ bundler: # " " " " "
+ bundler-cache: # " " " " "
+ cache-version: # " " " " "
+ rubygems: # " " " " "
+ working-directory: # " " " " "
+ apt: # Ubuntu
+ brew: # macOS
+ mingw: # Windows mingw / mswin /ucrt
+ msys2: # mingw / mswin /ucrt
+ mswin: # Windows mswin
+ choco: # mswin
+ vcpkg: # mswin
```
## Input Information
-All inputs are optional.
-
-### ruby-version:
-
-Installs the Ruby version using the code from [ruby/setup-ruby]. The available versions can be found in its [README](https://github.com/ruby/setup-ruby/blob/master/README.md#supported-versions).
+Information on inputs passed to [ruby/setup-ruby] is contained in its [README] and
+[action.yml] files.
-### bundler:
-
-Installs Bundler using the code from [ruby/setup-ruby].
+All inputs are optional.
### apt: (Ubuntu)
@@ -49,34 +50,29 @@ List of packages to install. Space delimited. Special options are `_update_` an
### mingw: (Windows)
-
- - Ruby 2.4 & later
- - List of MSYS2 MinGW packages to install.
- Space delimited. The package prefix (
mingw-w64-x86_64-) is not required.
If _upgrade_ is included in the input, all packages needed by the gcc tools are updated.
If openssl is included, an appropriate package will be installed.
-
- - Ruby 2.3 & earlier
- - The following DevKit packages are available:
-
- - libffi-3.2.1
- - openssl-1.0.2j
- - ragel-6.7
- - sqlite-3.7.15.2 (sqlite3)
- - zlib-1.2.8
-
-
- - Ruby mswin
- - If
openssl is included, it will be installed for mswin as a convenience.
Likewise, if ragel is included, the MSYS2 ragel package will be installed.
+* **Ruby 2.4 & later**
+ List of MSYS2 MinGW packages to install.
+ Space delimited. The package prefix (`mingw-w64-x86_64-` or `mingw-w64-ucrt-x86_64-`) is not required.
If `_upgrade_` is included in the input, all packages needed by the gcc tools are updated.
If `openssl` is included, an appropriate package will be installed.
+
+* **Ruby 2.3 & earlier**
+ The following DevKit packages are available:
+ * libffi-3.2.1
+ * openssl-1.0.2j
+ * ragel-6.7
+ * sqlite-3.7.15.2 (sqlite3)
+ * zlib-1.2.8
+
+* **Ruby mswin**
+ If `openssl` is included, it will be installed for mswin as a convenience.
Likewise, if `ragel` is included, the MSYS2 ragel package will be installed.
### msys2: (Windows)
-
- - Ruby 2.4 & later
- - List of MSYS2 packages to install. Space delimited. These are command line utilities, and are rarely needed.
-
- - Ruby 2.3 & earlier
- - No action, as no utilities are available for the older MSYS/DevKit.
-
+* **Ruby 2.4 & later**
+ List of MSYS2 packages to install. Space delimited. These are command line utilities, and are rarely needed.
+
+* **Ruby 2.3 & earlier**
### mswin: (Windows)
diff --git a/RELEASES.md b/RELEASES.md
index 554f9e0..3371b06 100644
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -1,5 +1,20 @@
# @MSP-Greg/setup-ruby-pkgs Releases
+### v1.30.2 - 2022-May-04
+- Improve input doc, update dependencies
+
+### v1.30.1 - 2022-Jan-27
+- [mswin openssl - keep in Program Files](https://github.com/MSP-Greg/setup-ruby-pkgs/commit/4fc46d3152)
+
+### v1.30.0 - 2022-Jan-13
+- Updates for Windows ucrt builds
+
+### v1.29.2 - 2021-Sep-09
+- [Add pkgconf to gcc packages](https://github.com/MSP-Greg/setup-ruby-pkgs/commit/5f02b049d9)
+
+### v1.29.1 - 2021-Jun-24
+- [Disable slow pacman disk space check](https://github.com/MSP-Greg/setup-ruby-pkgs/commit/1cff2817ea)
+
### v1.10.0
- [Update MSYS2 to 2020-05-20](https://github.com/MSP-Greg/setup-ruby-pkgs/commit/b5d86ae)
diff --git a/Ruby_and_Windows.md b/Ruby_and_Windows.md
index 14795ea..e15ad15 100644
--- a/Ruby_and_Windows.md
+++ b/Ruby_and_Windows.md
@@ -1,11 +1,13 @@
[MSYS2]:https://github.com/msys2
[ruby/setup-ruby]:https://github.com/ruby/setup-ruby
+**NOTE:** This doc is outdated. Updates regarding ucrt and mswin builds to follow.
+
# Ruby and Windows
This document is intended to provide information on Windows Ruby builds that may help with Windows CI problems.
-Problems are most likely to occur with gems/repos that require compiling. They may also occur when installing dependencies that require compiling.
+Problems are most likely to occur with gems/repos (or their dependencies) that require compiling.
Much of the below information is general, and may also help with users having problems locally.
diff --git a/action.yml b/action.yml
index 2bb117b..c2fe0ef 100644
--- a/action.yml
+++ b/action.yml
@@ -1,40 +1,56 @@
+---
name: 'Setup Ruby Pkgs'
description: 'Cross platform action for setting up Ruby build environments. Runs ruby/setup-ruby, see input info'
author: 'MSP-Greg'
+# https://docs.github.com/en/actions/creating-actions/metadata-syntax-for-github-actions#inputs
inputs:
+ #————————————————————————————————————————— inputs used by ruby/setup-ruby
ruby-version:
description: |
Used by ruby/setup-ruby. Ruby version.
- See https://github.com/ruby/setup-ruby/blob/master/README.md.
+ See https://github.com/ruby/setup-ruby/blob/master/README.md and
+ https://github.com/ruby/setup-ruby/blob/master/action.yml.
A value of 'none' will bypass running ruby/setup-ruby.
required: false
default: 'default'
bundler:
description: |
Used by ruby/setup-ruby. The version of Bundler to install.
- See https://github.com/ruby/setup-ruby/blob/master/README.md.
+ See https://github.com/ruby/setup-ruby/blob/master/README.md and
+ https://github.com/ruby/setup-ruby/blob/master/action.yml.
required: false
default: 'default'
bundler-cache:
description: |
Used by ruby/setup-ruby. Run 'bundle install', and cache the result automatically.
- See https://github.com/ruby/setup-ruby/blob/master/README.md.
+ See https://github.com/ruby/setup-ruby/blob/master/README.md and
+ https://github.com/ruby/setup-ruby/blob/master/action.yml.
required: false
default: 'false'
+ rubygems:
+ description: |
+ Used by ruby/setup-ruby. Runs `gem update --system`.
+ See https://github.com/ruby/setup-ruby/blob/master/README.md and
+ https://github.com/ruby/setup-ruby/blob/master/action.yml.
+ required: false
+ default: 'default'
working-directory:
description: |
Used by ruby/setup-ruby. The working directory to use for resolving paths for
.ruby-version, .tool-versions and Gemfile.lock.
- See https://github.com/ruby/setup-ruby/blob/master/README.md.
+ See https://github.com/ruby/setup-ruby/blob/master/README.md and
+ https://github.com/ruby/setup-ruby/blob/master/action.yml.
required: false
default: '.'
cache-version:
description: |
Used by ruby/setup-ruby. Arbitrary string that will be added to the cache key
of the bundler cache. Set or change it if you need to invalidate the cache.
- See https://github.com/ruby/setup-ruby/blob/master/README.md.
+ See https://github.com/ruby/setup-ruby/blob/master/README.md and
+ https://github.com/ruby/setup-ruby/blob/master/action.yml.
required: false
default: '0'
+ #————————————————————————————————————————— inputs used by this setup-ruby-pkgs
apt-get:
description: 'Ubuntu - install packages'
required: false
diff --git a/dist/index.js b/dist/index.js
index 71b6bb2..2f982a3 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -153,13 +153,13 @@ __nccwpck_require__.r(__webpack_exports__);
/* harmony export */ });
-const cp = __nccwpck_require__(129)
-const fs = __nccwpck_require__(747)
-const path = __nccwpck_require__(622)
+const cp = __nccwpck_require__(81)
+const fs = __nccwpck_require__(147)
+const path = __nccwpck_require__(17)
const core = __nccwpck_require__(186)
const httpc = __nccwpck_require__(925)
-const { performance } = __nccwpck_require__(630)
+const { performance } = __nccwpck_require__(74)
const colors = {
'yel': '\x1b[93m',
@@ -291,7 +291,7 @@ __nccwpck_require__.r(__webpack_exports__);
/* harmony export */ });
-const fs = __nccwpck_require__(747)
+const fs = __nccwpck_require__(147)
const core = __nccwpck_require__(186)
// , updateKeyRing
@@ -443,7 +443,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__(270).addVCVARSEnv)()
return
}
@@ -560,7 +560,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__(91)/* .old_pkgs */ .c)
}
// install user specificied packages
@@ -595,7 +595,7 @@ __nccwpck_require__.r(__webpack_exports__);
/* harmony export */ });
-const fs = __nccwpck_require__(747)
+const fs = __nccwpck_require__(147)
const core = __nccwpck_require__(186)
// , updateKeyRing
@@ -619,7 +619,7 @@ const run = async () => {
// await updateKeyRing('1~20210213-1')
if (mingw.includes('ragel') && !mswin.includes('ragel')) {
- mswin += ' mingw-w64-x86_64-ragel'
+ mswin += ' mingw-w64-ucrt-x86_64-ragel'
mswin = mswin.trim()
}
msSt = grpSt(`install msys2 packages: ${mswin}`)
@@ -691,7 +691,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__(87));
+const os = __importStar(__nccwpck_require__(37));
const utils_1 = __nccwpck_require__(278);
/**
* Commands
@@ -802,8 +802,8 @@ exports.getIDToken = exports.getState = exports.saveState = exports.group = expo
const command_1 = __nccwpck_require__(351);
const file_command_1 = __nccwpck_require__(717);
const utils_1 = __nccwpck_require__(278);
-const os = __importStar(__nccwpck_require__(87));
-const path = __importStar(__nccwpck_require__(622));
+const os = __importStar(__nccwpck_require__(37));
+const path = __importStar(__nccwpck_require__(17));
const oidc_utils_1 = __nccwpck_require__(41);
/**
* The code to exit an action
@@ -1079,6 +1079,11 @@ function getIDToken(aud) {
});
}
exports.getIDToken = getIDToken;
+/**
+ * Markdown summary exports
+ */
+var markdown_summary_1 = __nccwpck_require__(42);
+Object.defineProperty(exports, "markdownSummary", ({ enumerable: true, get: function () { return markdown_summary_1.markdownSummary; } }));
//# sourceMappingURL=core.js.map
/***/ }),
@@ -1112,8 +1117,8 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.issueCommand = void 0;
// We use any as a valid input type
/* eslint-disable @typescript-eslint/no-explicit-any */
-const fs = __importStar(__nccwpck_require__(747));
-const os = __importStar(__nccwpck_require__(87));
+const fs = __importStar(__nccwpck_require__(147));
+const os = __importStar(__nccwpck_require__(37));
const utils_1 = __nccwpck_require__(278);
function issueCommand(command, message) {
const filePath = process.env[`GITHUB_${command}`];
@@ -1132,6 +1137,292 @@ exports.issueCommand = issueCommand;
/***/ }),
+/***/ 42:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+ 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) : adopt(result.value).then(fulfilled, rejected); }
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
+ });
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+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 { 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-markdown-summary';
+class MarkdownSummary {
+ constructor() {
+ this._buffer = '';
+ }
+ /**
+ * Finds the summary file path from the environment, rejects if env var is not found or file does not exist
+ * Also checks r/w permissions.
+ *
+ * @returns step summary file path
+ */
+ filePath() {
+ return __awaiter(this, void 0, void 0, function* () {
+ if (this._filePath) {
+ return this._filePath;
+ }
+ const pathFromEnv = process.env[exports.SUMMARY_ENV_VAR];
+ if (!pathFromEnv) {
+ throw new Error(`Unable to find environment variable for $${exports.SUMMARY_ENV_VAR}. Check if your runtime environment supports markdown summaries.`);
+ }
+ try {
+ yield access(pathFromEnv, fs_1.constants.R_OK | fs_1.constants.W_OK);
+ }
+ catch (_a) {
+ throw new Error(`Unable to access summary file: '${pathFromEnv}'. Check if the file has correct read/write permissions.`);
+ }
+ this._filePath = pathFromEnv;
+ return this._filePath;
+ });
+ }
+ /**
+ * Wraps content in an HTML tag, adding any HTML attributes
+ *
+ * @param {string} tag HTML tag to wrap
+ * @param {string | null} content content within the tag
+ * @param {[attribute: string]: string} attrs key-value list of HTML attributes to add
+ *
+ * @returns {string} content wrapped in HTML element
+ */
+ wrap(tag, content, attrs = {}) {
+ const htmlAttrs = Object.entries(attrs)
+ .map(([key, value]) => ` ${key}="${value}"`)
+ .join('');
+ if (!content) {
+ return `<${tag}${htmlAttrs}>`;
+ }
+ return `<${tag}${htmlAttrs}>${content}`;
+ }
+ /**
+ * Writes text in the buffer to the summary buffer file and empties buffer. Will append by default.
+ *
+ * @param {SummaryWriteOptions} [options] (optional) options for write operation
+ *
+ * @returns {Promise} markdown summary instance
+ */
+ write(options) {
+ return __awaiter(this, void 0, void 0, function* () {
+ const overwrite = !!(options === null || options === void 0 ? void 0 : options.overwrite);
+ const filePath = yield this.filePath();
+ const writeFunc = overwrite ? writeFile : appendFile;
+ yield writeFunc(filePath, this._buffer, { encoding: 'utf8' });
+ return this.emptyBuffer();
+ });
+ }
+ /**
+ * Clears the summary buffer and wipes the summary file
+ *
+ * @returns {MarkdownSummary} markdown summary instance
+ */
+ clear() {
+ return __awaiter(this, void 0, void 0, function* () {
+ return this.emptyBuffer().write({ overwrite: true });
+ });
+ }
+ /**
+ * Returns the current summary buffer as a string
+ *
+ * @returns {string} string of summary buffer
+ */
+ stringify() {
+ return this._buffer;
+ }
+ /**
+ * If the summary buffer is empty
+ *
+ * @returns {boolen} true if the buffer is empty
+ */
+ isEmptyBuffer() {
+ return this._buffer.length === 0;
+ }
+ /**
+ * Resets the summary buffer without writing to summary file
+ *
+ * @returns {MarkdownSummary} markdown summary instance
+ */
+ emptyBuffer() {
+ this._buffer = '';
+ return this;
+ }
+ /**
+ * Adds raw text to the summary buffer
+ *
+ * @param {string} text content to add
+ * @param {boolean} [addEOL=false] (optional) append an EOL to the raw text (default: false)
+ *
+ * @returns {MarkdownSummary} markdown summary instance
+ */
+ addRaw(text, addEOL = false) {
+ this._buffer += text;
+ return addEOL ? this.addEOL() : this;
+ }
+ /**
+ * Adds the operating system-specific end-of-line marker to the buffer
+ *
+ * @returns {MarkdownSummary} markdown summary instance
+ */
+ addEOL() {
+ return this.addRaw(os_1.EOL);
+ }
+ /**
+ * Adds an HTML codeblock to the summary buffer
+ *
+ * @param {string} code content to render within fenced code block
+ * @param {string} lang (optional) language to syntax highlight code
+ *
+ * @returns {MarkdownSummary} markdown summary instance
+ */
+ addCodeBlock(code, lang) {
+ const attrs = Object.assign({}, (lang && { lang }));
+ const element = this.wrap('pre', this.wrap('code', code), attrs);
+ return this.addRaw(element).addEOL();
+ }
+ /**
+ * Adds an HTML list to the summary buffer
+ *
+ * @param {string[]} items list of items to render
+ * @param {boolean} [ordered=false] (optional) if the rendered list should be ordered or not (default: false)
+ *
+ * @returns {MarkdownSummary} markdown summary instance
+ */
+ addList(items, ordered = false) {
+ const tag = ordered ? 'ol' : 'ul';
+ const listItems = items.map(item => this.wrap('li', item)).join('');
+ const element = this.wrap(tag, listItems);
+ return this.addRaw(element).addEOL();
+ }
+ /**
+ * Adds an HTML table to the summary buffer
+ *
+ * @param {SummaryTableCell[]} rows table rows
+ *
+ * @returns {MarkdownSummary} markdown summary instance
+ */
+ addTable(rows) {
+ const tableBody = rows
+ .map(row => {
+ const cells = row
+ .map(cell => {
+ if (typeof cell === 'string') {
+ return this.wrap('td', cell);
+ }
+ const { header, data, colspan, rowspan } = cell;
+ const tag = header ? 'th' : 'td';
+ const attrs = Object.assign(Object.assign({}, (colspan && { colspan })), (rowspan && { rowspan }));
+ return this.wrap(tag, data, attrs);
+ })
+ .join('');
+ return this.wrap('tr', cells);
+ })
+ .join('');
+ const element = this.wrap('table', tableBody);
+ return this.addRaw(element).addEOL();
+ }
+ /**
+ * Adds a collapsable HTML details element to the summary buffer
+ *
+ * @param {string} label text for the closed state
+ * @param {string} content collapsable content
+ *
+ * @returns {MarkdownSummary} markdown summary instance
+ */
+ addDetails(label, content) {
+ const element = this.wrap('details', this.wrap('summary', label) + content);
+ return this.addRaw(element).addEOL();
+ }
+ /**
+ * Adds an HTML image tag to the summary buffer
+ *
+ * @param {string} src path to the image you to embed
+ * @param {string} alt text description of the image
+ * @param {SummaryImageOptions} options (optional) addition image attributes
+ *
+ * @returns {MarkdownSummary} markdown summary instance
+ */
+ addImage(src, alt, options) {
+ const { width, height } = options || {};
+ const attrs = Object.assign(Object.assign({}, (width && { width })), (height && { height }));
+ const element = this.wrap('img', null, Object.assign({ src, alt }, attrs));
+ return this.addRaw(element).addEOL();
+ }
+ /**
+ * Adds an HTML section heading element
+ *
+ * @param {string} text heading text
+ * @param {number | string} [level=1] (optional) the heading level, default: 1
+ *
+ * @returns {MarkdownSummary} markdown summary instance
+ */
+ addHeading(text, level) {
+ const tag = `h${level}`;
+ const allowedTag = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'].includes(tag)
+ ? tag
+ : 'h1';
+ const element = this.wrap(allowedTag, text);
+ return this.addRaw(element).addEOL();
+ }
+ /**
+ * Adds an HTML thematic break (
) to the summary buffer
+ *
+ * @returns {MarkdownSummary} markdown summary instance
+ */
+ addSeparator() {
+ const element = this.wrap('hr', null);
+ return this.addRaw(element).addEOL();
+ }
+ /**
+ * Adds an HTML line break (
) to the summary buffer
+ *
+ * @returns {MarkdownSummary} markdown summary instance
+ */
+ addBreak() {
+ const element = this.wrap('br', null);
+ return this.addRaw(element).addEOL();
+ }
+ /**
+ * Adds an HTML blockquote to the summary buffer
+ *
+ * @param {string} text quote text
+ * @param {string} cite (optional) citation url
+ *
+ * @returns {MarkdownSummary} markdown summary instance
+ */
+ addQuote(text, cite) {
+ const attrs = Object.assign({}, (cite && { cite }));
+ const element = this.wrap('blockquote', text, attrs);
+ return this.addRaw(element).addEOL();
+ }
+ /**
+ * Adds an HTML anchor tag to the summary buffer
+ *
+ * @param {string} text link text/content
+ * @param {string} href hyperlink
+ *
+ * @returns {MarkdownSummary} markdown summary instance
+ */
+ addLink(text, href) {
+ const element = this.wrap('a', text, { href });
+ return this.addRaw(element).addEOL();
+ }
+}
+// singleton export
+exports.markdownSummary = new MarkdownSummary();
+//# sourceMappingURL=markdown-summary.js.map
+
+/***/ }),
+
/***/ 41:
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
@@ -1335,8 +1626,8 @@ exports.PersonalAccessTokenCredentialHandler = PersonalAccessTokenCredentialHand
"use strict";
Object.defineProperty(exports, "__esModule", ({ value: true }));
-const http = __nccwpck_require__(605);
-const https = __nccwpck_require__(211);
+const http = __nccwpck_require__(685);
+const https = __nccwpck_require__(687);
const pm = __nccwpck_require__(443);
let tunnel;
var HttpCodes;
@@ -1953,13 +2244,13 @@ module.exports = __nccwpck_require__(219);
"use strict";
-var net = __nccwpck_require__(631);
-var tls = __nccwpck_require__(16);
-var http = __nccwpck_require__(605);
-var https = __nccwpck_require__(211);
-var events = __nccwpck_require__(614);
-var assert = __nccwpck_require__(357);
-var util = __nccwpck_require__(669);
+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);
exports.httpOverHttp = httpOverHttp;
@@ -2246,7 +2537,7 @@ const old_pkgs = {
/***/ }),
-/***/ 357:
+/***/ 491:
/***/ ((module) => {
"use strict";
@@ -2254,7 +2545,7 @@ module.exports = require("assert");
/***/ }),
-/***/ 129:
+/***/ 81:
/***/ ((module) => {
"use strict";
@@ -2262,7 +2553,7 @@ module.exports = require("child_process");
/***/ }),
-/***/ 614:
+/***/ 361:
/***/ ((module) => {
"use strict";
@@ -2270,7 +2561,7 @@ module.exports = require("events");
/***/ }),
-/***/ 747:
+/***/ 147:
/***/ ((module) => {
"use strict";
@@ -2278,7 +2569,7 @@ module.exports = require("fs");
/***/ }),
-/***/ 605:
+/***/ 685:
/***/ ((module) => {
"use strict";
@@ -2286,7 +2577,7 @@ module.exports = require("http");
/***/ }),
-/***/ 211:
+/***/ 687:
/***/ ((module) => {
"use strict";
@@ -2294,7 +2585,7 @@ module.exports = require("https");
/***/ }),
-/***/ 631:
+/***/ 808:
/***/ ((module) => {
"use strict";
@@ -2302,7 +2593,7 @@ module.exports = require("net");
/***/ }),
-/***/ 87:
+/***/ 37:
/***/ ((module) => {
"use strict";
@@ -2310,7 +2601,7 @@ module.exports = require("os");
/***/ }),
-/***/ 622:
+/***/ 17:
/***/ ((module) => {
"use strict";
@@ -2318,7 +2609,7 @@ module.exports = require("path");
/***/ }),
-/***/ 630:
+/***/ 74:
/***/ ((module) => {
"use strict";
@@ -2326,7 +2617,7 @@ module.exports = require("perf_hooks");
/***/ }),
-/***/ 16:
+/***/ 404:
/***/ ((module) => {
"use strict";
@@ -2334,7 +2625,7 @@ module.exports = require("tls");
/***/ }),
-/***/ 669:
+/***/ 837:
/***/ ((module) => {
"use strict";
@@ -2416,11 +2707,11 @@ var __webpack_exports__ = {};
(async () => {
const core = __nccwpck_require__(186)
- const { performance } = __nccwpck_require__(630)
+ const { performance } = __nccwpck_require__(74)
const common = __nccwpck_require__(390)
- const platform = __nccwpck_require__(87).platform()
+ const platform = (__nccwpck_require__(37).platform)()
let ref = core.getInput('setup-ruby-ref')
if (ref === '') { ref = 'ruby/setup-ruby/v1' }
@@ -2463,8 +2754,8 @@ var __webpack_exports__ = {};
if (runner) { await runner.run() }
- if ((core.getInput('ruby-version') !== 'none') &&
- (core.getInput('bundler') !== 'none') ) {
+ if ((core.getInput('bundler') !== 'none') ||
+ (core.getInput('bundler-cache') === 'true')) {
doBundler = true
timeSt = performance.now()
common.log(` —————————————————— Bundler tasks using: ${ref}`)
diff --git a/dist/package.json b/dist/package.json
index 324e5e1..ce3632a 100644
--- a/dist/package.json
+++ b/dist/package.json
@@ -1,6 +1,6 @@
{
"name": "setup-ruby-pkgs",
- "version": "1.30.1",
+ "version": "1.30.2",
"description": "Install packages and update builds tools for Ruby",
"main": "index.js",
"scripts": {
@@ -23,10 +23,10 @@
"author": "MSP-Greg",
"license": "MIT",
"dependencies": {
- "@actions/core": "^1.6.0",
+ "@actions/core": "^1.7.0",
"@actions/http-client": "^1.0.11"
},
"devDependencies": {
- "@vercel/ncc": "^0.31.1"
+ "@vercel/ncc": "^0.33.4"
}
}
diff --git a/index.js b/index.js
index 48431f0..b35b994 100644
--- a/index.js
+++ b/index.js
@@ -49,8 +49,8 @@
if (runner) { await runner.run() }
- if ((core.getInput('ruby-version') !== 'none') &&
- (core.getInput('bundler') !== 'none') ) {
+ if ((core.getInput('bundler') !== 'none') ||
+ (core.getInput('bundler-cache') === 'true')) {
doBundler = true
timeSt = performance.now()
common.log(` —————————————————— Bundler tasks using: ${ref}`)
diff --git a/mswin.js b/mswin.js
index b4a56de..a43b54b 100644
--- a/mswin.js
+++ b/mswin.js
@@ -24,7 +24,7 @@ export const run = async () => {
// await updateKeyRing('1~20210213-1')
if (mingw.includes('ragel') && !mswin.includes('ragel')) {
- mswin += ' mingw-w64-x86_64-ragel'
+ mswin += ' mingw-w64-ucrt-x86_64-ragel'
mswin = mswin.trim()
}
msSt = grpSt(`install msys2 packages: ${mswin}`)
diff --git a/package.json b/package.json
index 324e5e1..8219cff 100644
--- a/package.json
+++ b/package.json
@@ -23,10 +23,10 @@
"author": "MSP-Greg",
"license": "MIT",
"dependencies": {
- "@actions/core": "^1.6.0",
+ "@actions/core": "^1.7.0",
"@actions/http-client": "^1.0.11"
},
"devDependencies": {
- "@vercel/ncc": "^0.31.1"
+ "@vercel/ncc": "^0.33.4"
}
}
diff --git a/yarn.lock b/yarn.lock
index 1bde893..c13e32e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,24 +2,24 @@
# yarn lockfile v1
-"@actions/core@^1.6.0":
- version "1.6.0"
- resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.6.0.tgz#0568e47039bfb6a9170393a73f3b7eb3b22462cb"
- integrity sha512-NB1UAZomZlCV/LmJqkLhNTqtKfFXJZAUPcfl/zqG7EfsQdeUJtaWO98SGbuQ3pydJ3fHl2CvI/51OKYlCYYcaw==
+"@actions/core@^1.7.0":
+ version "1.7.0"
+ resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.7.0.tgz#f179a5a0bf5c1102d89b8cf1712825e763feaee4"
+ integrity sha512-7fPSS7yKOhTpgLMbw7lBLc1QJWvJBBAgyTX2PEhagWcKK8t0H8AKCoPMfnrHqIm5cRYH4QFPqD1/ruhuUE7YcQ==
dependencies:
"@actions/http-client" "^1.0.11"
-"@actions/http-client@^1.0.11":
+"@actions/http-client@^1.0.11", "@actions/http-client@^2.0.0":
version "1.0.11"
resolved "https://registry.yarnpkg.com/@actions/http-client/-/http-client-1.0.11.tgz#c58b12e9aa8b159ee39e7dd6cbd0e91d905633c0"
integrity sha512-VRYHGQV1rqnROJqdMvGUbY/Kn8vriQe/F9HR2AlYHzmKuM/p3kjNuXhmdBfcVgsvRWTz5C5XW5xvndZrVBuAYg==
dependencies:
tunnel "0.0.6"
-"@vercel/ncc@^0.31.1":
- version "0.31.1"
- resolved "https://registry.yarnpkg.com/@vercel/ncc/-/ncc-0.31.1.tgz#9346c7e59326f5eeac75c0286e47df94c2d6d8f7"
- integrity sha512-g0FAxwdViI6UzsiVz5HssIHqjcPa1EHL6h+2dcJD893SoCJaGdqqgUF09xnMW6goWnnhbLvgiKlgJWrJa+7qYA==
+"@vercel/ncc@^0.33.4":
+ version "0.33.4"
+ resolved "https://registry.yarnpkg.com/@vercel/ncc/-/ncc-0.33.4.tgz#e44a87511f583b7ba88e4b9ae90eeb7ba252b872"
+ integrity sha512-ln18hs7dMffelP47tpkaR+V5Tj6coykNyxJrlcmCormPqRQjB/Gv4cu2FfBG+PMzIfdZp2CLDsrrB1NPU22Qhg==
tunnel@0.0.6:
version "0.0.6"