MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-05-12 21:03:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix: Address silent failure in release-patch-1-create-pr workflow (#12339)

Browse Source
This commit is contained in:
matt korwel
2025-10-30 20:09:22 -07:00
committed by GitHub
parent f566df91c8
commit e762cda55d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/release-patch-1-create-pr.yml
+1 -1
View File
@@ -99,12 +99,12 @@ jobs:
--channel="${PATCH_CHANNEL}" \ --channel="${PATCH_CHANNEL}" \
--pullRequestNumber="${ORIGINAL_PR}" \ --pullRequestNumber="${ORIGINAL_PR}" \
--dry-run="${DRY_RUN}" --dry-run="${DRY_RUN}"
echo "EXIT_CODE=$?" >> "$GITHUB_OUTPUT"
} 2>&1 | tee >( } 2>&1 | tee >(
echo "LOG_CONTENT<<EOF" >> "$GITHUB_ENV" echo "LOG_CONTENT<<EOF" >> "$GITHUB_ENV"
cat >> "$GITHUB_ENV" cat >> "$GITHUB_ENV"
echo "EOF" >> "$GITHUB_ENV" echo "EOF" >> "$GITHUB_ENV"
) )
echo "EXIT_CODE=${PIPESTATUS[0]}" >> "$GITHUB_OUTPUT"
- name: 'Comment on Original PR' - name: 'Comment on Original PR'
if: 'always() && inputs.original_pr' if: 'always() && inputs.original_pr'
scripts/releasing/create-patch-pr.js
+1 -1
View File
@@ -174,7 +174,7 @@ async function main() {
`📝 Creating commit with conflict markers for manual resolution...`, `📝 Creating commit with conflict markers for manual resolution...`,
); );
execSync('git add .'); execSync('git add .');
execSync(`git commit --no-edit`); execSync(`git commit --no-edit --no-verify`);
console.log(`✅ Committed cherry-pick with conflict markers`); console.log(`✅ Committed cherry-pick with conflict markers`);
} else { } else {
// Re-throw if it's not a conflict error // Re-throw if it's not a conflict error