From 7b0a8ed4103e31c3f0b4762fb0020cc44c0f9c92 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 28 Oct 2025 03:17:43 +0000 Subject: [PATCH 1/3] Initial plan From 87753996773cc49d533311c3ac53e9e55b8ef286 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 28 Oct 2025 03:36:35 +0000 Subject: [PATCH 2/3] Fix nested try-catch blocks in push_to_pull_request_branch Improved error handling by separating the nested try-catch blocks into three distinct error handlers: 1. git fetch origin - catches fetch errors 2. git rev-parse - catches branch verification errors 3. git checkout - catches checkout errors This provides clearer error messages and avoids the complexity of nested try-catch blocks where the inner catch was treating all errors as "branch doesn't exist" errors, even when git checkout might fail for other reasons (e.g., merge conflicts, permissions, etc.). Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com> --- .../changeset-generator.firewall.lock.yml | 31 +++++++++------ .github/workflows/mergefest.lock.yml | 31 +++++++++------ .github/workflows/poem-bot.lock.yml | 31 +++++++++------ .github/workflows/tidy.lock.yml | 31 +++++++++------ .../js/push_to_pull_request_branch.cjs | 39 ++++++++++++------- 5 files changed, 100 insertions(+), 63 deletions(-) diff --git a/.github/workflows/changeset-generator.firewall.lock.yml b/.github/workflows/changeset-generator.firewall.lock.yml index 12f7920e508..f22bfbb0a59 100644 --- a/.github/workflows/changeset-generator.firewall.lock.yml +++ b/.github/workflows/changeset-generator.firewall.lock.yml @@ -5149,18 +5149,25 @@ jobs: core.info(`Switching to branch: ${branchName}`); try { await exec.exec("git fetch origin"); - try { - await exec.exec(`git rev-parse --verify origin/${branchName}`); - await exec.exec(`git checkout -B ${branchName} origin/${branchName}`); - core.info(`Checked out existing branch from origin: ${branchName}`); - } catch (originError) { - core.setFailed( - `Branch ${branchName} does not exist on origin, can't push to it: ${originError instanceof Error ? originError.message : String(originError)}` - ); - return; - } - } catch (error) { - core.setFailed(`Failed to switch to branch ${branchName}: ${error instanceof Error ? error.message : String(error)}`); + } catch (fetchError) { + core.setFailed(`Failed to fetch from origin: ${fetchError instanceof Error ? fetchError.message : String(fetchError)}`); + return; + } + try { + await exec.exec(`git rev-parse --verify origin/${branchName}`); + } catch (verifyError) { + core.setFailed( + `Branch ${branchName} does not exist on origin, can't push to it: ${verifyError instanceof Error ? verifyError.message : String(verifyError)}` + ); + return; + } + try { + await exec.exec(`git checkout -B ${branchName} origin/${branchName}`); + core.info(`Checked out existing branch from origin: ${branchName}`); + } catch (checkoutError) { + core.setFailed( + `Failed to checkout branch ${branchName}: ${checkoutError instanceof Error ? checkoutError.message : String(checkoutError)}` + ); return; } if (!isEmpty) { diff --git a/.github/workflows/mergefest.lock.yml b/.github/workflows/mergefest.lock.yml index e3eef9f1cac..ea7675554c1 100644 --- a/.github/workflows/mergefest.lock.yml +++ b/.github/workflows/mergefest.lock.yml @@ -4842,18 +4842,25 @@ jobs: core.info(`Switching to branch: ${branchName}`); try { await exec.exec("git fetch origin"); - try { - await exec.exec(`git rev-parse --verify origin/${branchName}`); - await exec.exec(`git checkout -B ${branchName} origin/${branchName}`); - core.info(`Checked out existing branch from origin: ${branchName}`); - } catch (originError) { - core.setFailed( - `Branch ${branchName} does not exist on origin, can't push to it: ${originError instanceof Error ? originError.message : String(originError)}` - ); - return; - } - } catch (error) { - core.setFailed(`Failed to switch to branch ${branchName}: ${error instanceof Error ? error.message : String(error)}`); + } catch (fetchError) { + core.setFailed(`Failed to fetch from origin: ${fetchError instanceof Error ? fetchError.message : String(fetchError)}`); + return; + } + try { + await exec.exec(`git rev-parse --verify origin/${branchName}`); + } catch (verifyError) { + core.setFailed( + `Branch ${branchName} does not exist on origin, can't push to it: ${verifyError instanceof Error ? verifyError.message : String(verifyError)}` + ); + return; + } + try { + await exec.exec(`git checkout -B ${branchName} origin/${branchName}`); + core.info(`Checked out existing branch from origin: ${branchName}`); + } catch (checkoutError) { + core.setFailed( + `Failed to checkout branch ${branchName}: ${checkoutError instanceof Error ? checkoutError.message : String(checkoutError)}` + ); return; } if (!isEmpty) { diff --git a/.github/workflows/poem-bot.lock.yml b/.github/workflows/poem-bot.lock.yml index 55109e27a8f..e6b0513a49c 100644 --- a/.github/workflows/poem-bot.lock.yml +++ b/.github/workflows/poem-bot.lock.yml @@ -6644,18 +6644,25 @@ jobs: core.info(`Switching to branch: ${branchName}`); try { await exec.exec("git fetch origin"); - try { - await exec.exec(`git rev-parse --verify origin/${branchName}`); - await exec.exec(`git checkout -B ${branchName} origin/${branchName}`); - core.info(`Checked out existing branch from origin: ${branchName}`); - } catch (originError) { - core.setFailed( - `Branch ${branchName} does not exist on origin, can't push to it: ${originError instanceof Error ? originError.message : String(originError)}` - ); - return; - } - } catch (error) { - core.setFailed(`Failed to switch to branch ${branchName}: ${error instanceof Error ? error.message : String(error)}`); + } catch (fetchError) { + core.setFailed(`Failed to fetch from origin: ${fetchError instanceof Error ? fetchError.message : String(fetchError)}`); + return; + } + try { + await exec.exec(`git rev-parse --verify origin/${branchName}`); + } catch (verifyError) { + core.setFailed( + `Branch ${branchName} does not exist on origin, can't push to it: ${verifyError instanceof Error ? verifyError.message : String(verifyError)}` + ); + return; + } + try { + await exec.exec(`git checkout -B ${branchName} origin/${branchName}`); + core.info(`Checked out existing branch from origin: ${branchName}`); + } catch (checkoutError) { + core.setFailed( + `Failed to checkout branch ${branchName}: ${checkoutError instanceof Error ? checkoutError.message : String(checkoutError)}` + ); return; } if (!isEmpty) { diff --git a/.github/workflows/tidy.lock.yml b/.github/workflows/tidy.lock.yml index 77e72b886ba..aededbb42c0 100644 --- a/.github/workflows/tidy.lock.yml +++ b/.github/workflows/tidy.lock.yml @@ -5155,18 +5155,25 @@ jobs: core.info(`Switching to branch: ${branchName}`); try { await exec.exec("git fetch origin"); - try { - await exec.exec(`git rev-parse --verify origin/${branchName}`); - await exec.exec(`git checkout -B ${branchName} origin/${branchName}`); - core.info(`Checked out existing branch from origin: ${branchName}`); - } catch (originError) { - core.setFailed( - `Branch ${branchName} does not exist on origin, can't push to it: ${originError instanceof Error ? originError.message : String(originError)}` - ); - return; - } - } catch (error) { - core.setFailed(`Failed to switch to branch ${branchName}: ${error instanceof Error ? error.message : String(error)}`); + } catch (fetchError) { + core.setFailed(`Failed to fetch from origin: ${fetchError instanceof Error ? fetchError.message : String(fetchError)}`); + return; + } + try { + await exec.exec(`git rev-parse --verify origin/${branchName}`); + } catch (verifyError) { + core.setFailed( + `Branch ${branchName} does not exist on origin, can't push to it: ${verifyError instanceof Error ? verifyError.message : String(verifyError)}` + ); + return; + } + try { + await exec.exec(`git checkout -B ${branchName} origin/${branchName}`); + core.info(`Checked out existing branch from origin: ${branchName}`); + } catch (checkoutError) { + core.setFailed( + `Failed to checkout branch ${branchName}: ${checkoutError instanceof Error ? checkoutError.message : String(checkoutError)}` + ); return; } if (!isEmpty) { diff --git a/pkg/workflow/js/push_to_pull_request_branch.cjs b/pkg/workflow/js/push_to_pull_request_branch.cjs index 3aaddde6002..ee15223e6c0 100644 --- a/pkg/workflow/js/push_to_pull_request_branch.cjs +++ b/pkg/workflow/js/push_to_pull_request_branch.cjs @@ -256,24 +256,33 @@ async function main() { // Switch to or create the target branch core.info(`Switching to branch: ${branchName}`); + + // Fetch latest changes from origin try { - // Try to checkout existing branch first await exec.exec("git fetch origin"); + } catch (fetchError) { + core.setFailed(`Failed to fetch from origin: ${fetchError instanceof Error ? fetchError.message : String(fetchError)}`); + return; + } - // Check if branch exists on origin - try { - await exec.exec(`git rev-parse --verify origin/${branchName}`); - await exec.exec(`git checkout -B ${branchName} origin/${branchName}`); - core.info(`Checked out existing branch from origin: ${branchName}`); - } catch (originError) { - // Give an error if branch doesn't exist on origin - core.setFailed( - `Branch ${branchName} does not exist on origin, can't push to it: ${originError instanceof Error ? originError.message : String(originError)}` - ); - return; - } - } catch (error) { - core.setFailed(`Failed to switch to branch ${branchName}: ${error instanceof Error ? error.message : String(error)}`); + // Check if branch exists on origin + try { + await exec.exec(`git rev-parse --verify origin/${branchName}`); + } catch (verifyError) { + core.setFailed( + `Branch ${branchName} does not exist on origin, can't push to it: ${verifyError instanceof Error ? verifyError.message : String(verifyError)}` + ); + return; + } + + // Checkout the branch from origin + try { + await exec.exec(`git checkout -B ${branchName} origin/${branchName}`); + core.info(`Checked out existing branch from origin: ${branchName}`); + } catch (checkoutError) { + core.setFailed( + `Failed to checkout branch ${branchName}: ${checkoutError instanceof Error ? checkoutError.message : String(checkoutError)}` + ); return; } From cb9e8a5f55c4560ff0bfaac1426736d03ac06129 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 28 Oct 2025 04:10:10 +0000 Subject: [PATCH 3/3] Fix patch preview logging to avoid truncation issues The patch preview was being logged as a single multi-line string which could cause GitHub Actions log truncation or formatting issues. Changed to log each line separately using a loop to ensure proper output formatting. Fixed in both push_to_pull_request_branch.cjs and create_pull_request.cjs for consistency. Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com> --- .../changeset-generator.firewall.lock.yml | 7 +++++-- .github/workflows/daily-doc-updater.lock.yml | 7 +++++-- .github/workflows/daily-perf-improver.lock.yml | 7 +++++-- .github/workflows/daily-test-improver.lock.yml | 7 +++++-- .github/workflows/dictation-prompt.lock.yml | 7 +++++-- .github/workflows/github-mcp-tools-report.lock.yml | 7 +++++-- .github/workflows/go-logger.lock.yml | 7 +++++-- .github/workflows/instructions-janitor.lock.yml | 7 +++++-- .github/workflows/mergefest.lock.yml | 7 +++++-- .github/workflows/poem-bot.lock.yml | 14 ++++++++++---- .github/workflows/q.lock.yml | 7 +++++-- .github/workflows/security-fix-pr.lock.yml | 7 +++++-- .github/workflows/technical-doc-writer.lock.yml | 7 +++++-- .github/workflows/tidy.lock.yml | 14 ++++++++++---- .github/workflows/unbloat-docs.lock.yml | 7 +++++-- pkg/workflow/js/create_pull_request.cjs | 7 +++++-- pkg/workflow/js/push_to_pull_request_branch.cjs | 7 +++++-- 17 files changed, 95 insertions(+), 38 deletions(-) diff --git a/.github/workflows/changeset-generator.firewall.lock.yml b/.github/workflows/changeset-generator.firewall.lock.yml index f22bfbb0a59..45ffdff505b 100644 --- a/.github/workflows/changeset-generator.firewall.lock.yml +++ b/.github/workflows/changeset-generator.firewall.lock.yml @@ -5186,8 +5186,11 @@ jobs: } const finalPatchContent = fs.readFileSync("/tmp/gh-aw/aw.patch", "utf8"); const patchLines = finalPatchContent.split("\n"); - const previewLines = patchLines.slice(0, 100).join("\n"); - core.info(`Patch preview (first ${Math.min(100, patchLines.length)} of ${patchLines.length} lines):\n${previewLines}`); + const previewLineCount = Math.min(100, patchLines.length); + core.info(`Patch preview (first ${previewLineCount} of ${patchLines.length} lines):`); + for (let i = 0; i < previewLineCount; i++) { + core.info(patchLines[i]); + } await exec.exec("git am /tmp/gh-aw/aw.patch"); core.info("Patch applied successfully"); await exec.exec(`git push origin ${branchName}`); diff --git a/.github/workflows/daily-doc-updater.lock.yml b/.github/workflows/daily-doc-updater.lock.yml index d0983bae509..2d104405f17 100644 --- a/.github/workflows/daily-doc-updater.lock.yml +++ b/.github/workflows/daily-doc-updater.lock.yml @@ -3591,8 +3591,11 @@ jobs: if (!isEmpty) { core.info("Applying patch..."); const patchLines = patchContent.split("\n"); - const previewLines = patchLines.slice(0, 500).join("\n"); - core.info(`Patch preview (first ${Math.min(500, patchLines.length)} of ${patchLines.length} lines):\n${previewLines}`); + const previewLineCount = Math.min(500, patchLines.length); + core.info(`Patch preview (first ${previewLineCount} of ${patchLines.length} lines):`); + for (let i = 0; i < previewLineCount; i++) { + core.info(patchLines[i]); + } try { await exec.exec("git am /tmp/gh-aw/aw.patch"); core.info("Patch applied successfully"); diff --git a/.github/workflows/daily-perf-improver.lock.yml b/.github/workflows/daily-perf-improver.lock.yml index 5ad6b7f02d0..837750fac34 100644 --- a/.github/workflows/daily-perf-improver.lock.yml +++ b/.github/workflows/daily-perf-improver.lock.yml @@ -4513,8 +4513,11 @@ jobs: if (!isEmpty) { core.info("Applying patch..."); const patchLines = patchContent.split("\n"); - const previewLines = patchLines.slice(0, 500).join("\n"); - core.info(`Patch preview (first ${Math.min(500, patchLines.length)} of ${patchLines.length} lines):\n${previewLines}`); + const previewLineCount = Math.min(500, patchLines.length); + core.info(`Patch preview (first ${previewLineCount} of ${patchLines.length} lines):`); + for (let i = 0; i < previewLineCount; i++) { + core.info(patchLines[i]); + } try { await exec.exec("git am /tmp/gh-aw/aw.patch"); core.info("Patch applied successfully"); diff --git a/.github/workflows/daily-test-improver.lock.yml b/.github/workflows/daily-test-improver.lock.yml index 32e882f30a7..93b2470fd21 100644 --- a/.github/workflows/daily-test-improver.lock.yml +++ b/.github/workflows/daily-test-improver.lock.yml @@ -4487,8 +4487,11 @@ jobs: if (!isEmpty) { core.info("Applying patch..."); const patchLines = patchContent.split("\n"); - const previewLines = patchLines.slice(0, 500).join("\n"); - core.info(`Patch preview (first ${Math.min(500, patchLines.length)} of ${patchLines.length} lines):\n${previewLines}`); + const previewLineCount = Math.min(500, patchLines.length); + core.info(`Patch preview (first ${previewLineCount} of ${patchLines.length} lines):`); + for (let i = 0; i < previewLineCount; i++) { + core.info(patchLines[i]); + } try { await exec.exec("git am /tmp/gh-aw/aw.patch"); core.info("Patch applied successfully"); diff --git a/.github/workflows/dictation-prompt.lock.yml b/.github/workflows/dictation-prompt.lock.yml index 60685cc2f46..50a0c5c758c 100644 --- a/.github/workflows/dictation-prompt.lock.yml +++ b/.github/workflows/dictation-prompt.lock.yml @@ -4215,8 +4215,11 @@ jobs: if (!isEmpty) { core.info("Applying patch..."); const patchLines = patchContent.split("\n"); - const previewLines = patchLines.slice(0, 500).join("\n"); - core.info(`Patch preview (first ${Math.min(500, patchLines.length)} of ${patchLines.length} lines):\n${previewLines}`); + const previewLineCount = Math.min(500, patchLines.length); + core.info(`Patch preview (first ${previewLineCount} of ${patchLines.length} lines):`); + for (let i = 0; i < previewLineCount; i++) { + core.info(patchLines[i]); + } try { await exec.exec("git am /tmp/gh-aw/aw.patch"); core.info("Patch applied successfully"); diff --git a/.github/workflows/github-mcp-tools-report.lock.yml b/.github/workflows/github-mcp-tools-report.lock.yml index b8585284f9c..e3be743d11f 100644 --- a/.github/workflows/github-mcp-tools-report.lock.yml +++ b/.github/workflows/github-mcp-tools-report.lock.yml @@ -4147,8 +4147,11 @@ jobs: if (!isEmpty) { core.info("Applying patch..."); const patchLines = patchContent.split("\n"); - const previewLines = patchLines.slice(0, 500).join("\n"); - core.info(`Patch preview (first ${Math.min(500, patchLines.length)} of ${patchLines.length} lines):\n${previewLines}`); + const previewLineCount = Math.min(500, patchLines.length); + core.info(`Patch preview (first ${previewLineCount} of ${patchLines.length} lines):`); + for (let i = 0; i < previewLineCount; i++) { + core.info(patchLines[i]); + } try { await exec.exec("git am /tmp/gh-aw/aw.patch"); core.info("Patch applied successfully"); diff --git a/.github/workflows/go-logger.lock.yml b/.github/workflows/go-logger.lock.yml index 3133c1c6f75..e01da77e934 100644 --- a/.github/workflows/go-logger.lock.yml +++ b/.github/workflows/go-logger.lock.yml @@ -3638,8 +3638,11 @@ jobs: if (!isEmpty) { core.info("Applying patch..."); const patchLines = patchContent.split("\n"); - const previewLines = patchLines.slice(0, 500).join("\n"); - core.info(`Patch preview (first ${Math.min(500, patchLines.length)} of ${patchLines.length} lines):\n${previewLines}`); + const previewLineCount = Math.min(500, patchLines.length); + core.info(`Patch preview (first ${previewLineCount} of ${patchLines.length} lines):`); + for (let i = 0; i < previewLineCount; i++) { + core.info(patchLines[i]); + } try { await exec.exec("git am /tmp/gh-aw/aw.patch"); core.info("Patch applied successfully"); diff --git a/.github/workflows/instructions-janitor.lock.yml b/.github/workflows/instructions-janitor.lock.yml index 3f3c8326c1f..60153679c74 100644 --- a/.github/workflows/instructions-janitor.lock.yml +++ b/.github/workflows/instructions-janitor.lock.yml @@ -3588,8 +3588,11 @@ jobs: if (!isEmpty) { core.info("Applying patch..."); const patchLines = patchContent.split("\n"); - const previewLines = patchLines.slice(0, 500).join("\n"); - core.info(`Patch preview (first ${Math.min(500, patchLines.length)} of ${patchLines.length} lines):\n${previewLines}`); + const previewLineCount = Math.min(500, patchLines.length); + core.info(`Patch preview (first ${previewLineCount} of ${patchLines.length} lines):`); + for (let i = 0; i < previewLineCount; i++) { + core.info(patchLines[i]); + } try { await exec.exec("git am /tmp/gh-aw/aw.patch"); core.info("Patch applied successfully"); diff --git a/.github/workflows/mergefest.lock.yml b/.github/workflows/mergefest.lock.yml index ea7675554c1..9f66ba80c9b 100644 --- a/.github/workflows/mergefest.lock.yml +++ b/.github/workflows/mergefest.lock.yml @@ -4879,8 +4879,11 @@ jobs: } const finalPatchContent = fs.readFileSync("/tmp/gh-aw/aw.patch", "utf8"); const patchLines = finalPatchContent.split("\n"); - const previewLines = patchLines.slice(0, 100).join("\n"); - core.info(`Patch preview (first ${Math.min(100, patchLines.length)} of ${patchLines.length} lines):\n${previewLines}`); + const previewLineCount = Math.min(100, patchLines.length); + core.info(`Patch preview (first ${previewLineCount} of ${patchLines.length} lines):`); + for (let i = 0; i < previewLineCount; i++) { + core.info(patchLines[i]); + } await exec.exec("git am /tmp/gh-aw/aw.patch"); core.info("Patch applied successfully"); await exec.exec(`git push origin ${branchName}`); diff --git a/.github/workflows/poem-bot.lock.yml b/.github/workflows/poem-bot.lock.yml index e6b0513a49c..a5c61388da0 100644 --- a/.github/workflows/poem-bot.lock.yml +++ b/.github/workflows/poem-bot.lock.yml @@ -5684,8 +5684,11 @@ jobs: if (!isEmpty) { core.info("Applying patch..."); const patchLines = patchContent.split("\n"); - const previewLines = patchLines.slice(0, 500).join("\n"); - core.info(`Patch preview (first ${Math.min(500, patchLines.length)} of ${patchLines.length} lines):\n${previewLines}`); + const previewLineCount = Math.min(500, patchLines.length); + core.info(`Patch preview (first ${previewLineCount} of ${patchLines.length} lines):`); + for (let i = 0; i < previewLineCount; i++) { + core.info(patchLines[i]); + } try { await exec.exec("git am /tmp/gh-aw/aw.patch"); core.info("Patch applied successfully"); @@ -6681,8 +6684,11 @@ jobs: } const finalPatchContent = fs.readFileSync("/tmp/gh-aw/aw.patch", "utf8"); const patchLines = finalPatchContent.split("\n"); - const previewLines = patchLines.slice(0, 100).join("\n"); - core.info(`Patch preview (first ${Math.min(100, patchLines.length)} of ${patchLines.length} lines):\n${previewLines}`); + const previewLineCount = Math.min(100, patchLines.length); + core.info(`Patch preview (first ${previewLineCount} of ${patchLines.length} lines):`); + for (let i = 0; i < previewLineCount; i++) { + core.info(patchLines[i]); + } await exec.exec("git am /tmp/gh-aw/aw.patch"); core.info("Patch applied successfully"); await exec.exec(`git push origin ${branchName}`); diff --git a/.github/workflows/q.lock.yml b/.github/workflows/q.lock.yml index 1804457180e..5937bc1bb41 100644 --- a/.github/workflows/q.lock.yml +++ b/.github/workflows/q.lock.yml @@ -5113,8 +5113,11 @@ jobs: if (!isEmpty) { core.info("Applying patch..."); const patchLines = patchContent.split("\n"); - const previewLines = patchLines.slice(0, 500).join("\n"); - core.info(`Patch preview (first ${Math.min(500, patchLines.length)} of ${patchLines.length} lines):\n${previewLines}`); + const previewLineCount = Math.min(500, patchLines.length); + core.info(`Patch preview (first ${previewLineCount} of ${patchLines.length} lines):`); + for (let i = 0; i < previewLineCount; i++) { + core.info(patchLines[i]); + } try { await exec.exec("git am /tmp/gh-aw/aw.patch"); core.info("Patch applied successfully"); diff --git a/.github/workflows/security-fix-pr.lock.yml b/.github/workflows/security-fix-pr.lock.yml index 060307d5a4b..2a909187847 100644 --- a/.github/workflows/security-fix-pr.lock.yml +++ b/.github/workflows/security-fix-pr.lock.yml @@ -3533,8 +3533,11 @@ jobs: if (!isEmpty) { core.info("Applying patch..."); const patchLines = patchContent.split("\n"); - const previewLines = patchLines.slice(0, 500).join("\n"); - core.info(`Patch preview (first ${Math.min(500, patchLines.length)} of ${patchLines.length} lines):\n${previewLines}`); + const previewLineCount = Math.min(500, patchLines.length); + core.info(`Patch preview (first ${previewLineCount} of ${patchLines.length} lines):`); + for (let i = 0; i < previewLineCount; i++) { + core.info(patchLines[i]); + } try { await exec.exec("git am /tmp/gh-aw/aw.patch"); core.info("Patch applied successfully"); diff --git a/.github/workflows/technical-doc-writer.lock.yml b/.github/workflows/technical-doc-writer.lock.yml index 5f9f139af94..14e51a2dd0a 100644 --- a/.github/workflows/technical-doc-writer.lock.yml +++ b/.github/workflows/technical-doc-writer.lock.yml @@ -4268,8 +4268,11 @@ jobs: if (!isEmpty) { core.info("Applying patch..."); const patchLines = patchContent.split("\n"); - const previewLines = patchLines.slice(0, 500).join("\n"); - core.info(`Patch preview (first ${Math.min(500, patchLines.length)} of ${patchLines.length} lines):\n${previewLines}`); + const previewLineCount = Math.min(500, patchLines.length); + core.info(`Patch preview (first ${previewLineCount} of ${patchLines.length} lines):`); + for (let i = 0; i < previewLineCount; i++) { + core.info(patchLines[i]); + } try { await exec.exec("git am /tmp/gh-aw/aw.patch"); core.info("Patch applied successfully"); diff --git a/.github/workflows/tidy.lock.yml b/.github/workflows/tidy.lock.yml index aededbb42c0..9ab7b6f898c 100644 --- a/.github/workflows/tidy.lock.yml +++ b/.github/workflows/tidy.lock.yml @@ -4195,8 +4195,11 @@ jobs: if (!isEmpty) { core.info("Applying patch..."); const patchLines = patchContent.split("\n"); - const previewLines = patchLines.slice(0, 500).join("\n"); - core.info(`Patch preview (first ${Math.min(500, patchLines.length)} of ${patchLines.length} lines):\n${previewLines}`); + const previewLineCount = Math.min(500, patchLines.length); + core.info(`Patch preview (first ${previewLineCount} of ${patchLines.length} lines):`); + for (let i = 0; i < previewLineCount; i++) { + core.info(patchLines[i]); + } try { await exec.exec("git am /tmp/gh-aw/aw.patch"); core.info("Patch applied successfully"); @@ -5192,8 +5195,11 @@ jobs: } const finalPatchContent = fs.readFileSync("/tmp/gh-aw/aw.patch", "utf8"); const patchLines = finalPatchContent.split("\n"); - const previewLines = patchLines.slice(0, 100).join("\n"); - core.info(`Patch preview (first ${Math.min(100, patchLines.length)} of ${patchLines.length} lines):\n${previewLines}`); + const previewLineCount = Math.min(100, patchLines.length); + core.info(`Patch preview (first ${previewLineCount} of ${patchLines.length} lines):`); + for (let i = 0; i < previewLineCount; i++) { + core.info(patchLines[i]); + } await exec.exec("git am /tmp/gh-aw/aw.patch"); core.info("Patch applied successfully"); await exec.exec(`git push origin ${branchName}`); diff --git a/.github/workflows/unbloat-docs.lock.yml b/.github/workflows/unbloat-docs.lock.yml index b4b03051c3f..f00a2c72a37 100644 --- a/.github/workflows/unbloat-docs.lock.yml +++ b/.github/workflows/unbloat-docs.lock.yml @@ -4502,8 +4502,11 @@ jobs: if (!isEmpty) { core.info("Applying patch..."); const patchLines = patchContent.split("\n"); - const previewLines = patchLines.slice(0, 500).join("\n"); - core.info(`Patch preview (first ${Math.min(500, patchLines.length)} of ${patchLines.length} lines):\n${previewLines}`); + const previewLineCount = Math.min(500, patchLines.length); + core.info(`Patch preview (first ${previewLineCount} of ${patchLines.length} lines):`); + for (let i = 0; i < previewLineCount; i++) { + core.info(patchLines[i]); + } try { await exec.exec("git am /tmp/gh-aw/aw.patch"); core.info("Patch applied successfully"); diff --git a/pkg/workflow/js/create_pull_request.cjs b/pkg/workflow/js/create_pull_request.cjs index 8a38baa25ef..55ae2efdd51 100644 --- a/pkg/workflow/js/create_pull_request.cjs +++ b/pkg/workflow/js/create_pull_request.cjs @@ -326,8 +326,11 @@ async function main() { // Log first 500 lines of patch for debugging const patchLines = patchContent.split("\n"); - const previewLines = patchLines.slice(0, 500).join("\n"); - core.info(`Patch preview (first ${Math.min(500, patchLines.length)} of ${patchLines.length} lines):\n${previewLines}`); + const previewLineCount = Math.min(500, patchLines.length); + core.info(`Patch preview (first ${previewLineCount} of ${patchLines.length} lines):`); + for (let i = 0; i < previewLineCount; i++) { + core.info(patchLines[i]); + } // Patches are created with git format-patch, so use git am to apply them try { diff --git a/pkg/workflow/js/push_to_pull_request_branch.cjs b/pkg/workflow/js/push_to_pull_request_branch.cjs index ee15223e6c0..ce29382daa9 100644 --- a/pkg/workflow/js/push_to_pull_request_branch.cjs +++ b/pkg/workflow/js/push_to_pull_request_branch.cjs @@ -315,8 +315,11 @@ async function main() { // Log first 100 lines of patch for debugging const finalPatchContent = fs.readFileSync("/tmp/gh-aw/aw.patch", "utf8"); const patchLines = finalPatchContent.split("\n"); - const previewLines = patchLines.slice(0, 100).join("\n"); - core.info(`Patch preview (first ${Math.min(100, patchLines.length)} of ${patchLines.length} lines):\n${previewLines}`); + const previewLineCount = Math.min(100, patchLines.length); + core.info(`Patch preview (first ${previewLineCount} of ${patchLines.length} lines):`); + for (let i = 0; i < previewLineCount; i++) { + core.info(patchLines[i]); + } // Patches are created with git format-patch, so use git am to apply them await exec.exec("git am /tmp/gh-aw/aw.patch");