Skip to content

Commit ec2ff51

Browse files
committed
Fixing lint and prettier errors
Signed-off-by: Vacha Shah <vachshah@amazon.com>
1 parent dc45320 commit ec2ff51

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

src/backport.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,14 @@ const backportOnce = async ({
108108
try {
109109
await git("cherry-pick", "-x", "-n", commitSha);
110110
} catch (error: unknown) {
111-
logError(
112-
"Possibly a conflict error. Trying to skip possible conflict files. ",
113-
);
111+
if (error instanceof Error) {
112+
logError(
113+
"Possibly a conflict error. Trying to skip possible conflict files. ",
114+
);
115+
console.log(error.message);
116+
} else {
117+
console.log("Unexpected error", error);
118+
}
114119
}
115120

116121
/* eslint-disable no-await-in-loop */
@@ -333,7 +338,7 @@ const backport = async ({
333338
commitSha: mergeCommitSha,
334339
errorMessage: error.message,
335340
head,
336-
repo
341+
repo,
337342
}),
338343
issue_number: number,
339344
owner,

xo.config.cjs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ module.exports = {
4848
"newlines-between": "never",
4949
},
5050
],
51-
"no-console": "error",
5251
"object-shorthand": [
5352
"error",
5453
"always",

0 commit comments

Comments
 (0)