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

driazati pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tvm.git


The following commit(s) were added to refs/heads/main by this push:
     new 06748583eb [ci] Fix docker post-merge builds on main (#12210)
06748583eb is described below

commit 06748583ebc6d6a159bc1fcd2feef67167deee87
Author: Andrew Reusch <[email protected]>
AuthorDate: Thu Jul 28 10:30:16 2022 -0700

    [ci] Fix docker post-merge builds on main (#12210)
    
    * This patch addresses #12097 by referencing the branch from the 
`BRANCH_NAME` environment variable, which is also used in the Jenkinsfile
    * This avoids git rev-parse, which assumes the local repo contains a git 
branch that matches the name of the branch being merged. I think this is in 
spirit of what the script was trying for.
---
 tests/scripts/git_change_docker.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/scripts/git_change_docker.sh 
b/tests/scripts/git_change_docker.sh
index 26532756b7..7fc855544a 100755
--- a/tests/scripts/git_change_docker.sh
+++ b/tests/scripts/git_change_docker.sh
@@ -19,8 +19,7 @@
 
 set -eux
 
-BRANCH=$(git rev-parse --abbrev-ref HEAD)
-if [ "$BRANCH" == "main" ]; then
+if [ "${BRANCH_NAME}" == "main" ]; then
     changed_files=$(git diff --no-commit-id --name-only -r HEAD~1)
 else
     changed_files=$(git diff --no-commit-id --name-only -r origin/main)

Reply via email to