Merge pull request #6656 from emqx/fix-shellcheck
fix(ci): fix shellcheck file pattern
This commit is contained in:
commit
b04d91a356
|
@ -39,6 +39,7 @@ is_cluster_up() {
|
||||||
is_node_listening node2.emqx.io
|
is_node_listening node2.emqx.io
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# shellcheck disable=SC2086
|
||||||
docker-compose \
|
docker-compose \
|
||||||
-f .ci/docker-compose-file/docker-compose-emqx-cluster.yaml \
|
-f .ci/docker-compose-file/docker-compose-emqx-cluster.yaml \
|
||||||
$CLUSTER_OVERRIDES \
|
$CLUSTER_OVERRIDES \
|
||||||
|
|
2
bin/emqx
2
bin/emqx
|
@ -10,7 +10,7 @@ if [ "$DEBUG" -eq 1 ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ROOT_DIR="$(cd "$(dirname "$(readlink "$0" || echo "$0")")"/..; pwd -P)"
|
ROOT_DIR="$(cd "$(dirname "$(readlink "$0" || echo "$0")")"/..; pwd -P)"
|
||||||
# shellcheck disable=SC1090
|
# shellcheck disable=SC1090,SC1091
|
||||||
. "$ROOT_DIR"/releases/emqx_vars
|
. "$ROOT_DIR"/releases/emqx_vars
|
||||||
|
|
||||||
# defined in emqx_vars
|
# defined in emqx_vars
|
||||||
|
|
|
@ -12,7 +12,7 @@ RELEASE="$(grep -E "define.+EMQX_RELEASE" apps/emqx/include/emqx_release.hrl | c
|
||||||
git_exact_vsn() {
|
git_exact_vsn() {
|
||||||
local tag
|
local tag
|
||||||
tag="$(git describe --tags --match "[e|v]*" --exact 2>/dev/null)"
|
tag="$(git describe --tags --match "[e|v]*" --exact 2>/dev/null)"
|
||||||
echo "$tag" | sed 's/^[v|e]//g'
|
echo "${tag//^[v|e]/}"
|
||||||
}
|
}
|
||||||
|
|
||||||
GIT_EXACT_VSN="$(git_exact_vsn)"
|
GIT_EXACT_VSN="$(git_exact_vsn)"
|
||||||
|
|
|
@ -13,4 +13,5 @@ if [ "$1" != "emqx" ]; then
|
||||||
BASEDIR="$1"
|
BASEDIR="$1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
find "${BASEDIR}/test/props" -name "prop_*.erl" 2>/dev/null | xargs -I{} basename {} .erl | xargs | tr ' ' ','
|
find "${BASEDIR}/test/props" -name "prop_*.erl" -print0 2>/dev/null | \
|
||||||
|
xargs -0 -I{} basename {} .erl | xargs | tr ' ' ','
|
||||||
|
|
|
@ -9,4 +9,4 @@ set -euo pipefail
|
||||||
cd -P -- "$(dirname -- "$0")/.."
|
cd -P -- "$(dirname -- "$0")/.."
|
||||||
|
|
||||||
TESTDIR="$1/test"
|
TESTDIR="$1/test"
|
||||||
find "${TESTDIR}" -name "*_SUITE.erl" 2>/dev/null | xargs | tr ' ' ','
|
find "${TESTDIR}" -name "*_SUITE.erl" -print0 2>/dev/null | xargs -0 | tr ' ' ','
|
||||||
|
|
|
@ -6,7 +6,7 @@ target_files=()
|
||||||
while IFS='' read -r line;
|
while IFS='' read -r line;
|
||||||
do
|
do
|
||||||
target_files+=("$line");
|
target_files+=("$line");
|
||||||
done < <(git grep -r -l "^#!/bin/" .)
|
done < <(git grep -r -l '^#!/\(bin/\|usr/bin/env bash\)' .)
|
||||||
return_code=0
|
return_code=0
|
||||||
for i in "${target_files[@]}"; do
|
for i in "${target_files[@]}"; do
|
||||||
echo checking "$i" ...
|
echo checking "$i" ...
|
||||||
|
|
Loading…
Reference in New Issue