Skip to content

Conversation

@areusch
Copy link
Contributor

@areusch areusch commented Apr 14, 2022

  • 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 e370ed459739f5312e45a2fb3a446b120f8ec5d1
    
     *** 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.
    

cc @tqchen @driazati @Mousius

@areusch
Copy link
Contributor Author

areusch commented Apr 14, 2022

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/

Copy link
Contributor

@leandron leandron left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Member

@driazati driazati left a 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

@areusch
Copy link
Contributor Author

areusch commented Apr 14, 2022

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.
@areusch areusch changed the title Fix broken CI when git-merge needs to create a commit. [skip ci] Fix broken CI when git-merge needs to create a commit. Apr 14, 2022
@areusch areusch merged commit 0e1a2a2 into apache:main Apr 14, 2022
@gromero
Copy link
Contributor

gromero commented Apr 14, 2022

@areusch Thanks for fixing it! I tried to investigate it yesterday but I was not able to reproduce locally (not it's clear why)!

Lucien0 pushed a commit to Lucien0/tvm that referenced this pull request Apr 19, 2022
- 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.
altanh pushed a commit to altanh/tvm that referenced this pull request Apr 28, 2022
- 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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants