Merge pull request #10862 from ethereum/fix-wrong-script-path-in-check-style-sh

Fix check_style.sh refactor
This commit is contained in:
Kamil Śliwak
2021-01-28 13:58:20 +01:00
committed by GitHub
2 changed files with 3 additions and 6 deletions
+2 -2
View File
@@ -27,7 +27,7 @@ if [[ "$WHITESPACE" != "" ]]
then
echo "Error: Trailing whitespace found:" | tee -a "$ERROR_LOG"
echo "$WHITESPACE" | tee -a "$ERROR_LOG"
scripts/post_style_errors_on_github.sh "$ERROR_LOG"
scripts/ci/post_style_errors_on_github.sh "$ERROR_LOG"
exit 1
fi
@@ -56,7 +56,7 @@ if [[ "$FORMATERROR" != "" ]]
then
echo "Coding style error:" | tee -a "$ERROR_LOG"
echo "$FORMATERROR" | tee -a "$ERROR_LOG"
scripts/post_style_errors_on_github.sh "$ERROR_LOG"
scripts/ci/post_style_errors_on_github.sh "$ERROR_LOG"
exit 1
fi
)
+1 -4
View File
@@ -4,10 +4,7 @@ ERROR_LOG="$1"
function report_error_to_github
{
if [[ $CIRCLE_PR_NUMBER != "" ]]
then
CIRCLE_PR_NUMBER="${CIRCLE_PULL_REQUEST//[^0-9]/}"
fi
[[ $CIRCLE_PR_NUMBER != "" ]] || CIRCLE_PR_NUMBER="${CIRCLE_PULL_REQUEST//[^0-9]/}"
if [[ $CI == "true" ]]
then