From 2cb1cc5a8a852bffb061d754d9c1edd7b9bba20c Mon Sep 17 00:00:00 2001 From: Andrew Reusch Date: Wed, 13 Apr 2022 17:16:17 -0700 Subject: [PATCH] Fix broken CI when git-merge needs to create a commit. - 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. --- Jenkinsfile | 4 ++-- jenkins/Jenkinsfile.j2 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 97359f02750b..abe17fac3271 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -45,7 +45,7 @@ // 'python3 jenkins/generate.py' // Note: This timestamp is here to ensure that updates to the Jenkinsfile are // always rebased on main before merging: -// Generated at 2022-04-13T15:32:37.844476 +// Generated at 2022-04-14T17:16:16.585491 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> @@ -121,7 +121,7 @@ def init_git() { ).trim() } sh ( - script: "git merge ${upstream_revision}", + script: "git -c user.name=TVM-Jenkins -c user.email=jenkins@tvm.apache.org merge ${upstream_revision}", label: 'Merge to origin/main' ) diff --git a/jenkins/Jenkinsfile.j2 b/jenkins/Jenkinsfile.j2 index 1638a6201bf3..62a1487f7afc 100644 --- a/jenkins/Jenkinsfile.j2 +++ b/jenkins/Jenkinsfile.j2 @@ -118,7 +118,7 @@ def init_git() { ).trim() } sh ( - script: "git merge ${upstream_revision}", + script: "git -c user.name=TVM-Jenkins -c user.email=jenkins@tvm.apache.org merge ${upstream_revision}", label: 'Merge to origin/main' )