fix(ci): set git identity before re-merging target branch in PR workflows#1002
fix(ci): set git identity before re-merging target branch in PR workflows#1002IvanaGyro wants to merge 1 commit into
Conversation
|
Note Gemini is unable to generate a review for this pull request due to the file types involved not being currently supported. |
…lows The "Merge with latest target branch" step needs to create a real merge commit whenever the base branch has advanced past the PR's cached merge-preview commit, which requires a committer identity. Ubuntu runners have none configured, unlike macOS runners, so this fails intermittently with "fatal: empty ident name" depending on push timing. release_pypi.yml already set a bot identity here; apply the same fix to ci-cmake_tests.yml, ci-downstream-find-package.yml, clang-format-check.yml, and conda_build.yml. Co-Authored-By: Claude <noreply@anthropic.com>
0b67a0e to
fde8d73
Compare
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #1002 +/- ##
=======================================
Coverage 30.92% 30.92%
=======================================
Files 229 229
Lines 34760 34760
Branches 14398 14398
=======================================
Hits 10749 10749
Misses 16708 16708
Partials 7303 7303
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report in Codecov by Harness.
🚀 New features to boost your workflow:
|
|
Thanks for this, @IvanaGyro — it's a correct fix. It's essentially identical to #1007 (same 4 workflow files, same Posted by Claude Code on behalf of @pcchen |
|
I will close this. |
Summary
Several PR workflows re-merge the base branch at job start so CI tests against the latest target branch, rather than a stale merge-preview commit:
When the base branch has advanced since GitHub computed the PR's merge-preview commit, this is a non-fast-forward merge, so git needs to create a real merge commit — which requires a committer identity. Ubuntu-hosted runners don't have one configured, while macOS-hosted runners do (a
~/.gitconfigis baked into that image), so this fails intermittently and only on Ubuntu with:This was observed on PR #987, where
BuildAndTest-ubuntu-latest,DownstreamFindPackage, andFormatting Checkall failed this way aftermasteradvanced mid-run, while the macOS legs of the same run succeeded.release_pypi.ymlalready sets a bot git identity before this same merge step. This PR applies the identical fix to the other four workflows that have the same unguarded pattern:ci-cmake_tests.ymlci-downstream-find-package.ymlclang-format-check.ymlconda_build.ymlTest plan
Generated by Claude Code