yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6068 from zmstone/fix-ci 

ci: fix job syntax
This commit is contained in:
Zaiming (Stone) Shi 2021-11-04 19:03:55 +01:00 committed by GitHub
parent 3b02366a5b ce8e52f4d0
commit 74e28cc4e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/code-style-check.yaml → .github/workflows/code_style_check.yaml vendored
View File

@ -23,5 +23,5 @@ jobs:
./scripts/elvis-check.sh $GITHUB_BASE_REF emqx ./scripts/elvis-check.sh $GITHUB_BASE_REF emqx
fi fi
- name: Check line-break at EOF - name: Check line-break at EOF
- run: | run: |
./scripts/check-nl-at-eof.sh ./scripts/check-nl-at-eof.sh

6
scripts/elvis-check.sh
View File

@ -5,10 +5,11 @@
set -euo pipefail set -euo pipefail
set -x
elvis_version='1.0.0-emqx-2' elvis_version='1.0.0-emqx-2'
base="${1:-}" base="${1:-}"
repo="${2:-emqx}" repo="${2:-emqx/emqx}"
REPO="${GITHUB_REPOSITORY:-${repo}}" REPO="${GITHUB_REPOSITORY:-${repo}}"
if [ "${base}" = "" ]; then if [ "${base}" = "" ]; then
echo "Usage $0 <git-compare-base-ref>" echo "Usage $0 <git-compare-base-ref>"
@ -27,7 +28,8 @@ if [[ "$base" =~ [0-9a-f]{8,40} ]]; then
# base is a commit sha1 # base is a commit sha1
compare_base="$base" compare_base="$base"
else else
remote="$(git remote -v | grep -E "github\.com(:|/)emqx/$REPO((\.git)|(\s))" | grep fetch | awk '{print $1}')" git remote -v
remote="$(git remote -v | grep -E "github\.com(:|/)$REPO((\.git)|(\s))" | grep fetch | awk '{print $1}')"
git fetch "$remote" "$base" git fetch "$remote" "$base"
compare_base="$remote/$base" compare_base="$remote/$base"
fi fi