[tvm] branch areusch-test-jenkinsfile-merge-fix updated (a5a6deaae0 -> cf94aac655)

[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


 discard a5a6deaae0 try to fix merging
     new cf94aac655 try to fix merging

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (a5a6deaae0)
            \
             N -- N -- N   refs/heads/areusch-test-jenkinsfile-merge-fix (cf94aac655)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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.


Summary of changes:
 Jenkinsfile            | 4 ++--
 jenkins/Jenkinsfile.j2 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

[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 cf94aac655b948364590a75c9ba7f979e0aa8fe7
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..b95b802e77 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:14:00.763838
 
 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 522a460c2d..b2ba54fcd9 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'
   )