From 7f8e1f56fa65d8d32035503f4f1dd1a4be8a2c8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 29 May 2021 22:58:52 +0700 Subject: [PATCH] ci/changed-templates: use tip of feature branch as tip The HEAD given by GitHub Action is always non-fast-forward merge commit. In the next change, lint-commits will use the tip from "changed_templates.sh". Let pick the correct tip for interrogation. --- common/travis/changed_templates.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/travis/changed_templates.sh b/common/travis/changed_templates.sh index d36ac8c52a..a6e5fb7432 100755 --- a/common/travis/changed_templates.sh +++ b/common/travis/changed_templates.sh @@ -8,7 +8,9 @@ elif command -v git >/dev/null 2>&1; then GIT_CMD=$(command -v git) fi -printf '%s ' "$(git merge-base FETCH_HEAD HEAD)" HEAD > /tmp/revisions +printf '%s %s\n' \ + "$(git merge-base FETCH_HEAD HEAD^2)" \ + "$(git rev-parse --verify HEAD^2)" > /tmp/revisions /bin/echo -e '\x1b[32mChanged packages:\x1b[0m' $GIT_CMD diff-tree -r --no-renames --name-only --diff-filter=AM \