Skip to content

Commit

Permalink
Merge branch 'main' into renovate/actions-core-1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
at-wat authored Jan 14, 2025
2 parents 8aacb6f + 7c57e1a commit fe0351c
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.17.0
20.18.1
31 changes: 15 additions & 16 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5072,7 +5072,7 @@ var external_child_process_ = __nccwpck_require__(81);
var promise_deferred_dist = __nccwpck_require__(156);
;// CONCATENATED MODULE: external "node:events"
const external_node_events_namespaceObject = require("node:events");
;// CONCATENATED MODULE: ./node_modules/.pnpm/simple-git@3.25.0/node_modules/simple-git/dist/esm/index.js
;// CONCATENATED MODULE: ./node_modules/.pnpm/simple-git@3.27.0/node_modules/simple-git/dist/esm/index.js
var __defProp = Object.defineProperty;
var __defProps = Object.defineProperties;
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
Expand Down Expand Up @@ -7057,15 +7057,17 @@ var init_parse_diff_summary = __esm({
nameStatusParser = [
new LineParser(
/([ACDMRTUXB])([0-9]{0,3})\t(.[^\t]*)(\t(.[^\t]*))?$/,
(result, [status, _similarity, from, _to, to]) => {
(result, [status, similarity, from, _to, to]) => {
result.changed++;
result.files.push({
file: to != null ? to : from,
changes: 0,
status: orVoid(isDiffNameStatus(status) && status),
insertions: 0,
deletions: 0,
binary: false
binary: false,
status: orVoid(isDiffNameStatus(status) && status),
from: orVoid(!!to && from !== to && from),
similarity: asNumber(similarity)
});
}
)
Expand Down Expand Up @@ -7094,15 +7096,12 @@ function createListLogSummaryParser(splitter = SPLITTER, fields = defaultFieldNa
const parseDiffResult = getDiffParser(logFormat);
return function(stdOut) {
const all = toLinesWithContent(
stdOut,
true,
stdOut.trim(),
false,
START_BOUNDARY
).map(function(item) {
const lineDetail = item.trim().split(COMMIT_BOUNDARY);
const listLogLine = lineBuilder(
lineDetail[0].trim().split(splitter),
fields
);
const lineDetail = item.split(COMMIT_BOUNDARY);
const listLogLine = lineBuilder(lineDetail[0].split(splitter), fields);
if (lineDetail.length > 1 && !!lineDetail[1].trim()) {
listLogLine.diff = parseDiffResult(lineDetail[1]);
}
Expand Down Expand Up @@ -7724,16 +7723,16 @@ var fromPathRegex, FileStatusSummary;
var init_FileStatusSummary = __esm({
"src/lib/responses/FileStatusSummary.ts"() {
"use strict";
fromPathRegex = /^(.+) -> (.+)$/;
fromPathRegex = /^(.+)\0(.+)$/;
FileStatusSummary = class {
constructor(path, index, working_dir) {
this.path = path;
this.index = index;
this.working_dir = working_dir;
if ("R" === index + working_dir) {
if (index === "R" || working_dir === "R") {
const detail = fromPathRegex.exec(path) || [null, path, path];
this.from = detail[1] || "";
this.path = detail[2] || "";
this.from = detail[2] || "";
this.path = detail[1] || "";
}
}
};
Expand Down Expand Up @@ -7771,7 +7770,7 @@ function splitLine(result, lineStr) {
handler(result, path);
}
if (raw !== "##" && raw !== "!!") {
result.files.push(new FileStatusSummary(path.replace(/\0.+$/, ""), index, workingDir));
result.files.push(new FileStatusSummary(path, index, workingDir));
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"@actions/core": "1.11.1",
"extract-pr-titles": "1.1.0",
"simple-git": "3.25.0"
"simple-git": "3.27.0"
},
"devDependencies": {
"@eslint/js": "^9.0.0",
Expand Down
10 changes: 5 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit fe0351c

Please sign in to comment.