cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fix check_style.sh refactor
This commit is contained in:
Kamil Śliwak 2021-01-28 13:58:20 +01:00 committed by GitHub
commit d753c1a047
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/check_style.sh
View File

@ -27,7 +27,7 @@ if [[ "$WHITESPACE" != "" ]]
then then
echo "Error: Trailing whitespace found:" | tee -a "$ERROR_LOG" echo "Error: Trailing whitespace found:" | tee -a "$ERROR_LOG"
echo "$WHITESPACE" | 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 exit 1
fi fi
@ -56,7 +56,7 @@ if [[ "$FORMATERROR" != "" ]]
then then
echo "Coding style error:" | tee -a "$ERROR_LOG" echo "Coding style error:" | tee -a "$ERROR_LOG"
echo "$FORMATERROR" | 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 exit 1
fi fi
) )

5
scripts/ci/post_style_errors_on_github.sh
View File

@ -4,10 +4,7 @@ ERROR_LOG="$1"
function report_error_to_github function report_error_to_github
{ {
if [[ $CIRCLE_PR_NUMBER != "" ]] [[ $CIRCLE_PR_NUMBER != "" ]] || CIRCLE_PR_NUMBER="${CIRCLE_PULL_REQUEST//[^0-9]/}"
then
CIRCLE_PR_NUMBER="${CIRCLE_PULL_REQUEST//[^0-9]/}"
fi
if [[ $CI == "true" ]] if [[ $CI == "true" ]]
then then