From 829f90162b5192d0a2fbea3d0b8f01f16372455c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 26 Nov 2022 05:45:28 +0000 Subject: [PATCH 1/2] Update dependency prettier to v2.8.0 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3691cb5..3bcd7f7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,7 @@ "husky": "7.0.4", "jest": "28.1.1", "lint-staged": "10.5.3", - "prettier": "2.6.2", + "prettier": "2.8.0", "prettier-eslint": "13.0.0", "prettier-eslint-cli": "5.0.1", "pretty-quick": "3.1.3", @@ -6531,9 +6531,9 @@ } }, "node_modules/prettier": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz", - "integrity": "sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.0.tgz", + "integrity": "sha512-9Lmg8hTFZKG0Asr/kW9Bp8tJjRVluO8EJQVfY2T7FMw9T5jy4I/Uvx0Rca/XWf50QQ1/SS48+6IJWnrb+2yemA==", "dev": true, "bin": { "prettier": "bin-prettier.js" @@ -13896,9 +13896,9 @@ "dev": true }, "prettier": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz", - "integrity": "sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.0.tgz", + "integrity": "sha512-9Lmg8hTFZKG0Asr/kW9Bp8tJjRVluO8EJQVfY2T7FMw9T5jy4I/Uvx0Rca/XWf50QQ1/SS48+6IJWnrb+2yemA==", "dev": true }, "prettier-eslint": { diff --git a/package.json b/package.json index e5884b1..e0886b1 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "husky": "7.0.4", "jest": "28.1.1", "lint-staged": "10.5.3", - "prettier": "2.6.2", + "prettier": "2.8.0", "prettier-eslint": "13.0.0", "prettier-eslint-cli": "5.0.1", "pretty-quick": "3.1.3", From 38ef4e979c5d05114afeb73fbb7dc8772e9c8b87 Mon Sep 17 00:00:00 2001 From: Github Workflow Date: Sat, 26 Nov 2022 05:46:07 +0000 Subject: [PATCH 2/2] Changes found on Workflow --- dist/index.js | 52 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/dist/index.js b/dist/index.js index 649104e..9bd545e 100644 --- a/dist/index.js +++ b/dist/index.js @@ -20211,11 +20211,12 @@ var require_file_command = __commonJS({ return result; }; Object.defineProperty(exports, '__esModule', { value: true }); - exports.issueCommand = void 0; + exports.prepareKeyValueMessage = exports.issueFileCommand = void 0; var fs = __importStar(require('fs')); var os = __importStar(require('os')); + var uuid_1 = require_dist(); var utils_1 = require_utils(); - function issueCommand(command, message) { + function issueFileCommand(command, message) { const filePath = process.env[`GITHUB_${command}`]; if (!filePath) { throw new Error(`Unable to find environment variable for file command ${command}`); @@ -20227,7 +20228,19 @@ var require_file_command = __commonJS({ encoding: 'utf8', }); } - exports.issueCommand = issueCommand; + exports.issueFileCommand = issueFileCommand; + function prepareKeyValueMessage(key, value) { + const delimiter = `ghadelimiter_${uuid_1.v4()}`; + const convertedValue = utils_1.toCommandValue(value); + if (key.includes(delimiter)) { + throw new Error(`Unexpected input: name should not contain the delimiter "${delimiter}"`); + } + if (convertedValue.includes(delimiter)) { + throw new Error(`Unexpected input: value should not contain the delimiter "${delimiter}"`); + } + return `${key}<<${delimiter}${os.EOL}${convertedValue}${os.EOL}${delimiter}`; + } + exports.prepareKeyValueMessage = prepareKeyValueMessage; }, }); @@ -21686,7 +21699,6 @@ var require_core2 = __commonJS({ var utils_1 = require_utils(); var os = __importStar(require('os')); var path = __importStar(require('path')); - var uuid_1 = require_dist(); var oidc_utils_1 = require_oidc_utils(); var ExitCode; (function (ExitCode2) { @@ -21698,18 +21710,9 @@ var require_core2 = __commonJS({ process.env[name] = convertedVal; const filePath = process.env['GITHUB_ENV'] || ''; if (filePath) { - const delimiter = `ghadelimiter_${uuid_1.v4()}`; - if (name.includes(delimiter)) { - throw new Error(`Unexpected input: name should not contain the delimiter "${delimiter}"`); - } - if (convertedVal.includes(delimiter)) { - throw new Error(`Unexpected input: value should not contain the delimiter "${delimiter}"`); - } - const commandValue = `${name}<<${delimiter}${os.EOL}${convertedVal}${os.EOL}${delimiter}`; - file_command_1.issueCommand('ENV', commandValue); - } else { - command_1.issueCommand('set-env', { name }, convertedVal); + return file_command_1.issueFileCommand('ENV', file_command_1.prepareKeyValueMessage(name, val)); } + command_1.issueCommand('set-env', { name }, convertedVal); } exports.exportVariable = exportVariable; function setSecret2(secret) { @@ -21719,7 +21722,7 @@ var require_core2 = __commonJS({ function addPath(inputPath) { const filePath = process.env['GITHUB_PATH'] || ''; if (filePath) { - file_command_1.issueCommand('PATH', inputPath); + file_command_1.issueFileCommand('PATH', inputPath); } else { command_1.issueCommand('add-path', {}, inputPath); } @@ -21741,7 +21744,10 @@ var require_core2 = __commonJS({ const inputs = getInput2(name, options) .split('\n') .filter((x) => x !== ''); - return inputs; + if (options && options.trimWhitespace === false) { + return inputs; + } + return inputs.map((input) => input.trim()); } exports.getMultilineInput = getMultilineInput; function getBooleanInput(name, options) { @@ -21755,8 +21761,12 @@ Support boolean input list: \`true | True | TRUE | false | False | FALSE\``); } exports.getBooleanInput = getBooleanInput; function setOutput2(name, value) { + const filePath = process.env['GITHUB_OUTPUT'] || ''; + if (filePath) { + return file_command_1.issueFileCommand('OUTPUT', file_command_1.prepareKeyValueMessage(name, value)); + } process.stdout.write(os.EOL); - command_1.issueCommand('set-output', { name }, value); + command_1.issueCommand('set-output', { name }, utils_1.toCommandValue(value)); } exports.setOutput = setOutput2; function setCommandEcho(enabled) { @@ -21826,7 +21836,11 @@ Support boolean input list: \`true | True | TRUE | false | False | FALSE\``); } exports.group = group; function saveState(name, value) { - command_1.issueCommand('save-state', { name }, value); + const filePath = process.env['GITHUB_STATE'] || ''; + if (filePath) { + return file_command_1.issueFileCommand('STATE', file_command_1.prepareKeyValueMessage(name, value)); + } + command_1.issueCommand('save-state', { name }, utils_1.toCommandValue(value)); } exports.saveState = saveState; function getState(name) {