Skip to content

Commit fbb2692

Browse files
marko-zivic-93marko-zivic-93
authored
Merge pull request actions#390 from rentziass/rentziass/update-actions-core
Update @actions/core to 1.10.0
2 parents e150063 + dfcd06a commit fbb2692

File tree

5 files changed

+81
-51
lines changed

5 files changed

+81
-51
lines changed

‎.licenses/npm/@actions/core.dep.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/cleanup/index.js

Lines changed: 36 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4831,7 +4831,6 @@ const file_command_1 = __nccwpck_require__(717);
48314831
const utils_1 = __nccwpck_require__(5278);
48324832
const os = __importStar(__nccwpck_require__(2037));
48334833
const path = __importStar(__nccwpck_require__(1017));
4834-
const uuid_1 = __nccwpck_require__(8974);
48354834
const oidc_utils_1 = __nccwpck_require__(8041);
48364835
/**
48374836
* The code to exit an action
@@ -4861,20 +4860,9 @@ function exportVariable(name, val) {
48614860
process.env[name] = convertedVal;
48624861
const filePath = process.env['GITHUB_ENV'] || '';
48634862
if (filePath) {
4864-
const delimiter = `ghadelimiter_${uuid_1.v4()}`;
4865-
// These should realistically never happen, but just in case someone finds a way to exploit uuid generation let's not allow keys or values that contain the delimiter.
4866-
if (name.includes(delimiter)) {
4867-
throw new Error(`Unexpected input: name should not contain the delimiter "${delimiter}"`);
4868-
}
4869-
if (convertedVal.includes(delimiter)) {
4870-
throw new Error(`Unexpected input: value should not contain the delimiter "${delimiter}"`);
4871-
}
4872-
const commandValue = `${name}<<${delimiter}${os.EOL}${convertedVal}${os.EOL}${delimiter}`;
4873-
file_command_1.issueCommand('ENV', commandValue);
4874-
}
4875-
else {
4876-
command_1.issueCommand('set-env', { name }, convertedVal);
4863+
return file_command_1.issueFileCommand('ENV', file_command_1.prepareKeyValueMessage(name, val));
48774864
}
4865+
command_1.issueCommand('set-env', { name }, convertedVal);
48784866
}
48794867
exports.exportVariable = exportVariable;
48804868
/**
@@ -4892,7 +4880,7 @@ exports.setSecret = setSecret;
48924880
function addPath(inputPath) {
48934881
const filePath = process.env['GITHUB_PATH'] || '';
48944882
if (filePath) {
4895-
file_command_1.issueCommand('PATH', inputPath);
4883+
file_command_1.issueFileCommand('PATH', inputPath);
48964884
}
48974885
else {
48984886
command_1.issueCommand('add-path', {}, inputPath);
@@ -4932,7 +4920,10 @@ function getMultilineInput(name, options) {
49324920
const inputs = getInput(name, options)
49334921
.split('\n')
49344922
.filter(x => x !== '');
4935-
return inputs;
4923+
if (options && options.trimWhitespace === false) {
4924+
return inputs;
4925+
}
4926+
return inputs.map(input => input.trim());
49364927
}
49374928
exports.getMultilineInput = getMultilineInput;
49384929
/**
@@ -4965,8 +4956,12 @@ exports.getBooleanInput = getBooleanInput;
49654956
*/
49664957
// eslint-disable-next-line @typescript-eslint/no-explicit-any
49674958
function setOutput(name, value) {
4959+
const filePath = process.env['GITHUB_OUTPUT'] || '';
4960+
if (filePath) {
4961+
return file_command_1.issueFileCommand('OUTPUT', file_command_1.prepareKeyValueMessage(name, value));
4962+
}
49684963
process.stdout.write(os.EOL);
4969-
command_1.issueCommand('set-output', { name }, value);
4964+
command_1.issueCommand('set-output', { name }, utils_1.toCommandValue(value));
49704965
}
49714966
exports.setOutput = setOutput;
49724967
/**
@@ -5095,7 +5090,11 @@ exports.group = group;
50955090
*/
50965091
// eslint-disable-next-line @typescript-eslint/no-explicit-any
50975092
function saveState(name, value) {
5098-
command_1.issueCommand('save-state', { name }, value);
5093+
const filePath = process.env['GITHUB_STATE'] || '';
5094+
if (filePath) {
5095+
return file_command_1.issueFileCommand('STATE', file_command_1.prepareKeyValueMessage(name, value));
5096+
}
5097+
command_1.issueCommand('save-state', { name }, utils_1.toCommandValue(value));
50995098
}
51005099
exports.saveState = saveState;
51015100
/**
@@ -5161,13 +5160,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
51615160
return result;
51625161
};
51635162
Object.defineProperty(exports, "__esModule", ({ value: true }));
5164-
exports.issueCommand = void 0;
5163+
exports.prepareKeyValueMessage = exports.issueFileCommand = void 0;
51655164
// We use any as a valid input type
51665165
/* eslint-disable @typescript-eslint/no-explicit-any */
51675166
const fs = __importStar(__nccwpck_require__(7147));
51685167
const os = __importStar(__nccwpck_require__(2037));
5168+
const uuid_1 = __nccwpck_require__(8974);
51695169
const utils_1 = __nccwpck_require__(5278);
5170-
function issueCommand(command, message) {
5170+
function issueFileCommand(command, message) {
51715171
const filePath = process.env[`GITHUB_${command}`];
51725172
if (!filePath) {
51735173
throw new Error(`Unable to find environment variable for file command ${command}`);
@@ -5179,7 +5179,22 @@ function issueCommand(command, message) {
51795179
encoding: 'utf8'
51805180
});
51815181
}
5182-
exports.issueCommand = issueCommand;
5182+
exports.issueFileCommand = issueFileCommand;
5183+
function prepareKeyValueMessage(key, value) {
5184+
const delimiter = `ghadelimiter_${uuid_1.v4()}`;
5185+
const convertedValue = utils_1.toCommandValue(value);
5186+
// These should realistically never happen, but just in case someone finds a
5187+
// way to exploit uuid generation let's not allow keys or values that contain
5188+
// the delimiter.
5189+
if (key.includes(delimiter)) {
5190+
throw new Error(`Unexpected input: name should not contain the delimiter "${delimiter}"`);
5191+
}
5192+
if (convertedValue.includes(delimiter)) {
5193+
throw new Error(`Unexpected input: value should not contain the delimiter "${delimiter}"`);
5194+
}
5195+
return `${key}<<${delimiter}${os.EOL}${convertedValue}${os.EOL}${delimiter}`;
5196+
}
5197+
exports.prepareKeyValueMessage = prepareKeyValueMessage;
51835198
//# sourceMappingURL=file-command.js.map
51845199

51855200
/***/ }),

‎dist/setup/index.js

Lines changed: 36 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4831,7 +4831,6 @@ const file_command_1 = __nccwpck_require__(717);
48314831
const utils_1 = __nccwpck_require__(5278);
48324832
const os = __importStar(__nccwpck_require__(2037));
48334833
const path = __importStar(__nccwpck_require__(1017));
4834-
const uuid_1 = __nccwpck_require__(8974);
48354834
const oidc_utils_1 = __nccwpck_require__(8041);
48364835
/**
48374836
* The code to exit an action
@@ -4861,20 +4860,9 @@ function exportVariable(name, val) {
48614860
process.env[name] = convertedVal;
48624861
const filePath = process.env['GITHUB_ENV'] || '';
48634862
if (filePath) {
4864-
const delimiter = `ghadelimiter_${uuid_1.v4()}`;
4865-
// These should realistically never happen, but just in case someone finds a way to exploit uuid generation let's not allow keys or values that contain the delimiter.
4866-
if (name.includes(delimiter)) {
4867-
throw new Error(`Unexpected input: name should not contain the delimiter "${delimiter}"`);
4868-
}
4869-
if (convertedVal.includes(delimiter)) {
4870-
throw new Error(`Unexpected input: value should not contain the delimiter "${delimiter}"`);
4871-
}
4872-
const commandValue = `${name}<<${delimiter}${os.EOL}${convertedVal}${os.EOL}${delimiter}`;
4873-
file_command_1.issueCommand('ENV', commandValue);
4874-
}
4875-
else {
4876-
command_1.issueCommand('set-env', { name }, convertedVal);
4863+
return file_command_1.issueFileCommand('ENV', file_command_1.prepareKeyValueMessage(name, val));
48774864
}
4865+
command_1.issueCommand('set-env', { name }, convertedVal);
48784866
}
48794867
exports.exportVariable = exportVariable;
48804868
/**
@@ -4892,7 +4880,7 @@ exports.setSecret = setSecret;
48924880
function addPath(inputPath) {
48934881
const filePath = process.env['GITHUB_PATH'] || '';
48944882
if (filePath) {
4895-
file_command_1.issueCommand('PATH', inputPath);
4883+
file_command_1.issueFileCommand('PATH', inputPath);
48964884
}
48974885
else {
48984886
command_1.issueCommand('add-path', {}, inputPath);
@@ -4932,7 +4920,10 @@ function getMultilineInput(name, options) {
49324920
const inputs = getInput(name, options)
49334921
.split('\n')
49344922
.filter(x => x !== '');
4935-
return inputs;
4923+
if (options && options.trimWhitespace === false) {
4924+
return inputs;
4925+
}
4926+
return inputs.map(input => input.trim());
49364927
}
49374928
exports.getMultilineInput = getMultilineInput;
49384929
/**
@@ -4965,8 +4956,12 @@ exports.getBooleanInput = getBooleanInput;
49654956
*/
49664957
// eslint-disable-next-line @typescript-eslint/no-explicit-any
49674958
function setOutput(name, value) {
4959+
const filePath = process.env['GITHUB_OUTPUT'] || '';
4960+
if (filePath) {
4961+
return file_command_1.issueFileCommand('OUTPUT', file_command_1.prepareKeyValueMessage(name, value));
4962+
}
49684963
process.stdout.write(os.EOL);
4969-
command_1.issueCommand('set-output', { name }, value);
4964+
command_1.issueCommand('set-output', { name }, utils_1.toCommandValue(value));
49704965
}
49714966
exports.setOutput = setOutput;
49724967
/**
@@ -5095,7 +5090,11 @@ exports.group = group;
50955090
*/
50965091
// eslint-disable-next-line @typescript-eslint/no-explicit-any
50975092
function saveState(name, value) {
5098-
command_1.issueCommand('save-state', { name }, value);
5093+
const filePath = process.env['GITHUB_STATE'] || '';
5094+
if (filePath) {
5095+
return file_command_1.issueFileCommand('STATE', file_command_1.prepareKeyValueMessage(name, value));
5096+
}
5097+
command_1.issueCommand('save-state', { name }, utils_1.toCommandValue(value));
50995098
}
51005099
exports.saveState = saveState;
51015100
/**
@@ -5161,13 +5160,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
51615160
return result;
51625161
};
51635162
Object.defineProperty(exports, "__esModule", ({ value: true }));
5164-
exports.issueCommand = void 0;
5163+
exports.prepareKeyValueMessage = exports.issueFileCommand = void 0;
51655164
// We use any as a valid input type
51665165
/* eslint-disable @typescript-eslint/no-explicit-any */
51675166
const fs = __importStar(__nccwpck_require__(7147));
51685167
const os = __importStar(__nccwpck_require__(2037));
5168+
const uuid_1 = __nccwpck_require__(8974);
51695169
const utils_1 = __nccwpck_require__(5278);
5170-
function issueCommand(command, message) {
5170+
function issueFileCommand(command, message) {
51715171
const filePath = process.env[`GITHUB_${command}`];
51725172
if (!filePath) {
51735173
throw new Error(`Unable to find environment variable for file command ${command}`);
@@ -5179,7 +5179,22 @@ function issueCommand(command, message) {
51795179
encoding: 'utf8'
51805180
});
51815181
}
5182-
exports.issueCommand = issueCommand;
5182+
exports.issueFileCommand = issueFileCommand;
5183+
function prepareKeyValueMessage(key, value) {
5184+
const delimiter = `ghadelimiter_${uuid_1.v4()}`;
5185+
const convertedValue = utils_1.toCommandValue(value);
5186+
// These should realistically never happen, but just in case someone finds a
5187+
// way to exploit uuid generation let's not allow keys or values that contain
5188+
// the delimiter.
5189+
if (key.includes(delimiter)) {
5190+
throw new Error(`Unexpected input: name should not contain the delimiter "${delimiter}"`);
5191+
}
5192+
if (convertedValue.includes(delimiter)) {
5193+
throw new Error(`Unexpected input: value should not contain the delimiter "${delimiter}"`);
5194+
}
5195+
return `${key}<<${delimiter}${os.EOL}${convertedValue}${os.EOL}${delimiter}`;
5196+
}
5197+
exports.prepareKeyValueMessage = prepareKeyValueMessage;
51835198
//# sourceMappingURL=file-command.js.map
51845199

51855200
/***/ }),

‎package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"license": "MIT",
2626
"dependencies": {
2727
"@actions/cache": "^3.0.0",
28-
"@actions/core": "^1.9.0",
28+
"@actions/core": "^1.10.0",
2929
"@actions/exec": "^1.0.4",
3030
"@actions/glob": "^0.2.0",
3131
"@actions/http-client": "^1.0.11",

0 commit comments

Comments
 (0)