From d1abb3081890169e391e78f3bcba0499964fdbcc Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Thu, 4 Nov 2021 15:22:33 +0100 Subject: [PATCH] ci: fix elvis check --- .github/workflows/code-style-check.yaml | 9 ++++++++- apps/emqx/test/emqx_pqueue_SUITE.erl | 3 ++- apps/emqx_connector/src/emqx_connector_redis.erl | 3 ++- apps/emqx_rule_engine/src/emqx_rule_maps.erl | 16 ++++++++-------- scripts/elvis-check.sh | 12 ++++-------- 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/.github/workflows/code-style-check.yaml b/.github/workflows/code-style-check.yaml index 93e363245..581dc4316 100644 --- a/.github/workflows/code-style-check.yaml +++ b/.github/workflows/code-style-check.yaml @@ -7,6 +7,8 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 + with: + fetch-depth: 1000 - name: Set git token if: endsWith(github.repository, 'enterprise') run: | @@ -14,7 +16,12 @@ jobs: git config --global credential.helper store - name: Run elvis check run: | - ./scripts/elvis-check.sh $GITHUB_BASE_REF + set -e + if [ -f EMQX_ENTERPRISE ]; then + ./scripts/elvis-check.sh $GITHUB_BASE_REF emqx-enterprise + else + ./scripts/elvis-check.sh $GITHUB_BASE_REF emqx + fi - name: Check line-break at EOF - run: | ./scripts/check-nl-at-eof.sh diff --git a/apps/emqx/test/emqx_pqueue_SUITE.erl b/apps/emqx/test/emqx_pqueue_SUITE.erl index 76075381d..797adb9ab 100644 --- a/apps/emqx/test/emqx_pqueue_SUITE.erl +++ b/apps/emqx/test/emqx_pqueue_SUITE.erl @@ -112,7 +112,8 @@ t_out(_) -> t_out_2(_) -> {empty, {pqueue, [{-1, {queue, [a], [], 1}}]}} = ?PQ:out(0, ?PQ:from_list([{1, a}])), {{value, a}, {queue, [], [], 0}} = ?PQ:out(1, ?PQ:from_list([{1, a}])), - {{value, a}, {pqueue, [{-1, {queue, [], [b], 1}}]}} = ?PQ:out(1, ?PQ:from_list([{1, a}, {1, b}])), + {{value, a}, {pqueue, [{-1, {queue, [], [b], 1}}]}} = + ?PQ:out(1, ?PQ:from_list([{1, a}, {1, b}])), {{value, a}, {queue, [b], [], 1}} = ?PQ:out(1, ?PQ:from_list([{1, a}, {0, b}])). t_out_p(_) -> diff --git a/apps/emqx_connector/src/emqx_connector_redis.erl b/apps/emqx_connector/src/emqx_connector_redis.erl index ff6e4d82d..670add693 100644 --- a/apps/emqx_connector/src/emqx_connector_redis.erl +++ b/apps/emqx_connector/src/emqx_connector_redis.erl @@ -100,7 +100,8 @@ on_start(InstId, #{redis_type := Type, Options = case maps:get(enable, SSL) of true -> [{ssl, true}, - {ssl_options, emqx_plugin_libs_ssl:save_files_return_opts(SSL, "connectors", InstId)} + {ssl_options, + emqx_plugin_libs_ssl:save_files_return_opts(SSL, "connectors", InstId)} ]; false -> [{ssl, false}] end ++ [{sentinel, maps:get(sentinel, Config, undefined)}], diff --git a/apps/emqx_rule_engine/src/emqx_rule_maps.erl b/apps/emqx_rule_engine/src/emqx_rule_maps.erl index c3f8fd3cf..fe4595c03 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_maps.erl +++ b/apps/emqx_rule_engine/src/emqx_rule_maps.erl @@ -33,7 +33,7 @@ nested_get({var, Key}, Data, Default) -> nested_get({path, Path}, Data, Default) when is_list(Path) -> do_nested_get(Path, Data, Data, Default). -do_nested_get([Key|More], Data, OrgData, Default) -> +do_nested_get([Key | More], Data, OrgData, Default) -> case general_map_get(Key, Data, OrgData, undefined) of undefined -> Default; Val -> do_nested_get(More, Val, OrgData, Default) @@ -51,7 +51,7 @@ nested_put({var, Key}, Val, Map) -> nested_put({path, Path}, Val, Map) when is_list(Path) -> do_nested_put(Path, Val, Map, Map). -do_nested_put([Key|More], Val, Map, OrgData) -> +do_nested_put([Key | More], Val, Map, OrgData) -> SubMap = general_map_get(Key, Map, OrgData, undefined), general_map_put(Key, do_nested_put(More, Val, SubMap, OrgData), Map, OrgData); do_nested_put([], Val, _Map, _OrgData) -> @@ -131,13 +131,13 @@ setnth(tail, List, Val) when is_list(List) -> List ++ [Val]; setnth(tail, _List, Val) -> [Val]; setnth(I, List, _Val) when not is_integer(I) -> List; setnth(0, List, _Val) -> List; -setnth(I, List, _Val) when is_integer(I), I > 0 -> - do_setnth(I, List, _Val); -setnth(I, List, _Val) when is_integer(I), I < 0 -> - lists:reverse(do_setnth(-I, lists:reverse(List), _Val)). +setnth(I, List, Val) when is_integer(I), I > 0 -> + do_setnth(I, List, Val); +setnth(I, List, Val) when is_integer(I), I < 0 -> + lists:reverse(do_setnth(-I, lists:reverse(List), Val)). -do_setnth(1, [_|Rest], Val) -> [Val|Rest]; -do_setnth(I, [E|Rest], Val) -> [E|setnth(I-1, Rest, Val)]; +do_setnth(1, [_ | Rest], Val) -> [Val | Rest]; +do_setnth(I, [E | Rest], Val) -> [E | setnth(I-1, Rest, Val)]; do_setnth(_, [], _Val) -> []. getnth(0, _) -> diff --git a/scripts/elvis-check.sh b/scripts/elvis-check.sh index 5fe482865..ebcea98bc 100755 --- a/scripts/elvis-check.sh +++ b/scripts/elvis-check.sh @@ -5,16 +5,16 @@ set -euo pipefail -ELVIS_VERSION='1.0.0-emqx-2' +elvis_version='1.0.0-emqx-2' base="${1:-}" +repo="${2:-emqx}" +REPO="${GITHUB_REPOSITORY:-${repo}}" if [ "${base}" = "" ]; then echo "Usage $0 " exit 1 fi -elvis_version="${2:-$ELVIS_VERSION}" - echo "elvis -v: $elvis_version" echo "git diff base: $base" @@ -27,11 +27,7 @@ if [[ "$base" =~ [0-9a-f]{8,40} ]]; then # base is a commit sha1 compare_base="$base" else - if [[ $CI == true ]];then - remote="$(git remote -v | grep -E "github\.com(.|/)$GITHUB_REPOSITORY" | grep fetch | awk '{print $1}')" - else - remote="$(git remote -v | grep -E 'github\.com(.|/)emqx' | grep fetch | awk '{print $1}')" - fi + remote="$(git remote -v | grep -E "github\.com(:|/)emqx/$REPO((\.git)|(\s))" | grep fetch | awk '{print $1}')" git fetch "$remote" "$base" compare_base="$remote/$base" fi