-
Notifications
You must be signed in to change notification settings - Fork 3.8k
[skip ci] Fix broken CI when git-merge needs to create a commit. #11007
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
|
Pushed this fix on top of the PR causing the problem, it seems to work: https://ci.tlcpack.ai/blue/organizations/jenkins/tvm/detail/areusch-test-jenkinsfile-merge-fix/3/pipeline/ |
leandron
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
driazati
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks for the fix (I had noticed it too #10988), since tvm-ci/pr-head was only enabled for a little bit we can't really test this but it's pretty straightforward
|
going to [skip ci] based on branch passing |
- This fixes an error seen when CI needs to create a merge commit
to sync the PR. CI started doing this recently to ensure that all
CI branches use the same commit for their regressions.
- The error looks like:
+ git merge e370ed4
*** Please tell me who you are.
Run
git config --global user.email "you@example.com"
git config --global user.name "Your Name"
to set your account's default identity.
Omit --global to set the identity only in this repository.
a4843f7 to
2cb1cc5
Compare
|
@areusch Thanks for fixing it! I tried to investigate it yesterday but I was not able to reproduce locally (not it's clear why)! |
- This fixes an error seen when CI needs to create a merge commit
to sync the PR. CI started doing this recently to ensure that all
CI branches use the same commit for their regressions.
- The error looks like:
+ git merge e370ed4
*** Please tell me who you are.
Run
git config --global user.email "you@example.com"
git config --global user.name "Your Name"
to set your account's default identity.
Omit --global to set the identity only in this repository.
- This fixes an error seen when CI needs to create a merge commit
to sync the PR. CI started doing this recently to ensure that all
CI branches use the same commit for their regressions.
- The error looks like:
+ git merge e370ed4
*** Please tell me who you are.
Run
git config --global user.email "you@example.com"
git config --global user.name "Your Name"
to set your account's default identity.
Omit --global to set the identity only in this repository.
This fixes an error seen when CI needs to create a merge commit
to sync the PR. CI started doing this recently to ensure that all
CI branches use the same commit for their regressions.
The error looks like:
cc @tqchen @driazati @Mousius