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 <[email protected]> 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 [email protected] 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 [email protected] merge ${upstream_revision}", label: 'Merge to origin/main' )
