[tvm] branch areusch-test-jenkinsfile-merge-fix created (now a5a6deaae0)

[ar...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

areusch pushed a change to branch areusch-test-jenkinsfile-merge-fix
in repository https://gitbox.apache.org/repos/asf/tvm.git


      at a5a6deaae0 try to fix merging

This branch includes the following new commits:

     new a5a6deaae0 try to fix merging

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[tvm] 01/01: try to fix merging

[ar...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

areusch pushed a commit to branch areusch-test-jenkinsfile-merge-fix
in repository https://gitbox.apache.org/repos/asf/tvm.git

commit a5a6deaae0ca4b3a198bf0e8a6aa84c733f15a71
Author: Andrew Reusch <ar...@gmail.com>
AuthorDate: Wed Apr 13 17:12:29 2022 -0700

    try to fix merging
---
 Jenkinsfile            | 4 ++--
 jenkins/Jenkinsfile.j2 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 29d19092a8..8a6fcc53c7 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-13T17:46:58.845847
+// Generated at 2022-04-14T00:12:14.966056
 
 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 merge -C user.name=TVM-Jenkins -C jenkins@tvm.apache.org ${upstream_revision}",
     label: 'Merge to origin/main'
   )
 
diff --git a/jenkins/Jenkinsfile.j2 b/jenkins/Jenkinsfile.j2
index 522a460c2d..09a9128aca 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 merge -C user.name=TVM-Jenkins -C jenkins@tvm.apache.org ${upstream_revision}",
     label: 'Merge to origin/main'
   )