From e06fcbb769b37941527660e12092c8b4d55052ae Mon Sep 17 00:00:00 2001
From: Zaiming Shi <zmstone@gmail.com>
Date: Wed, 9 Dec 2020 14:16:33 +0100
Subject: [PATCH] chore(elvis): only trigger in github action when pull request

---
 .github/workflows/elvis_lint.yaml |  6 ++----
 elvis-check.sh                    | 21 +++++++++------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/elvis_lint.yaml b/.github/workflows/elvis_lint.yaml
index 7d852b44f..6f9d8d31a 100644
--- a/.github/workflows/elvis_lint.yaml
+++ b/.github/workflows/elvis_lint.yaml
@@ -1,6 +1,6 @@
 name: Elvis Linter
 
-on: [push, pull_request]
+on: [pull_request]
 
 jobs:
   build:
@@ -8,6 +8,4 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - run: |
-          echo "$GITHUB_BASE_REF"
-          echo "$GITHUB_HEAD_REF"
-           ./elvis-check.sh $GITHUB_BASE_REF $GITHUB_HEAD_REF
+          ./elvis-check.sh $GITHUB_BASE_REF
diff --git a/elvis-check.sh b/elvis-check.sh
index 61b8e4c79..7f6213b08 100755
--- a/elvis-check.sh
+++ b/elvis-check.sh
@@ -2,30 +2,27 @@
 
 set -euo pipefail
 
-echo "GITHUB_BASE_REF  $1"
-echo "GITHUB_HEAD_REF  $2"
-echo "$GITHUB_SHA"
-
 ELVIS_VERSION='1.0.0-emqx-1'
 
 base=${GITHUB_BASE_REF:-$1}
-elvis_version="${3:-$ELVIS_VERSION}"
+elvis_version="${2:-$ELVIS_VERSION}"
 
-echo "$elvis_version"
-echo "$base"
+echo "elvis -v: $elvis_version"
+echo "git diff base: $base"
 
-if [ ! -f ./elvis ] || [ "$(./elvis -v | grep -oE '[1-9]+\.[0-9]+\.[0-9]+\-emqx-[0-9]+')" != "$ELVIS_VERSION" ]; then
+if [ ! -f ./elvis ] || [ "$(./elvis -v | grep -oE '[1-9]+\.[0-9]+\.[0-9]+\-emqx-[0-9]+')" != "$elvis_version" ]; then
     curl  -fLO "https://github.com/emqx/elvis/releases/download/$elvis_version/elvis"
     chmod +x ./elvis
 fi
 
 git fetch origin "$base"
-git checkout -b refBranch HEAD
-git diff --name-only origin/"$base" refBranch
+
+git_diff() {
+    git diff --name-only origin/"$base"...HEAD
+}
 
 bad_file_count=0
-for n in $(git diff --name-only origin/"$base" refBranch); do
-
+for n in $(git_diff); do
     if ! ./elvis rock "$n"; then
         bad_file_count=$(( bad_file_count + 1))
     fi