From e762cda55d39f30931c56ed116a0040279a81a94 Mon Sep 17 00:00:00 2001 From: matt korwel Date: Thu, 30 Oct 2025 20:09:22 -0700 Subject: [PATCH] fix: Address silent failure in release-patch-1-create-pr workflow (#12339) --- .github/workflows/release-patch-1-create-pr.yml | 2 +- scripts/releasing/create-patch-pr.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-patch-1-create-pr.yml b/.github/workflows/release-patch-1-create-pr.yml index 233b74a38c..b18891bfa1 100644 --- a/.github/workflows/release-patch-1-create-pr.yml +++ b/.github/workflows/release-patch-1-create-pr.yml @@ -99,12 +99,12 @@ jobs: --channel="${PATCH_CHANNEL}" \ --pullRequestNumber="${ORIGINAL_PR}" \ --dry-run="${DRY_RUN}" - echo "EXIT_CODE=$?" >> "$GITHUB_OUTPUT" } 2>&1 | tee >( echo "LOG_CONTENT<> "$GITHUB_ENV" cat >> "$GITHUB_ENV" echo "EOF" >> "$GITHUB_ENV" ) + echo "EXIT_CODE=${PIPESTATUS[0]}" >> "$GITHUB_OUTPUT" - name: 'Comment on Original PR' if: 'always() && inputs.original_pr' diff --git a/scripts/releasing/create-patch-pr.js b/scripts/releasing/create-patch-pr.js index 2fc63e5631..54c9dfa8e8 100644 --- a/scripts/releasing/create-patch-pr.js +++ b/scripts/releasing/create-patch-pr.js @@ -174,7 +174,7 @@ async function main() { `📝 Creating commit with conflict markers for manual resolution...`, ); execSync('git add .'); - execSync(`git commit --no-edit`); + execSync(`git commit --no-edit --no-verify`); console.log(`✅ Committed cherry-pick with conflict markers`); } else { // Re-throw if it's not a conflict error