bluewallet/GlaDOS
bluewallet/GlaDOS
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: try to squash if number of commits >= 3

Browse Source
This commit is contained in:
Ivan Vershigora 2026-05-17 21:18:13 +01:00 committed by Overtorment
parent dd17a568e9
commit 3026de1648
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main.ts
View File

@ -193,12 +193,38 @@ async function run(): Promise<void> {
// continue; // fixme
try {
const mergeResult = await octokit.pulls.merge({
const { data: prFull } = await octokit.pulls.get({
repo: "BlueWallet",
owner: "BlueWallet",
pull_number: pr.number,
});
let mergeResult;
if (prFull.commits >= 3) {
console.log(`PR has ${prFull.commits} commits (>=3), trying squash`);
try {
mergeResult = await octokit.pulls.merge({
repo: "BlueWallet",
owner: "BlueWallet",
pull_number: pr.number,
merge_method: "squash",
});
} catch (squashError) {
console.warn("squash failed, falling back to regular merge:", squashError.message);
mergeResult = await octokit.pulls.merge({
repo: "BlueWallet",
owner: "BlueWallet",
pull_number: pr.number,
});
}
} else {
mergeResult = await octokit.pulls.merge({
repo: "BlueWallet",
owner: "BlueWallet",
pull_number: pr.number,
});
}
let body = "I could not merge it.";
if (mergeResult.data.message.indexOf("successfully") !== -1) {
console.log({ mergeResult });