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

Add proper quotes in check_style.sh and report_errors.sh

Browse Source
This commit is contained in:
Kamil Śliwak 2021-01-15 21:11:57 +01:00
parent 1df284733e
commit 877b5d1c1c
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/check_style.sh
View File

@ -14,7 +14,7 @@ EXCLUDE_FILES_JOINED=${EXCLUDE_FILES_JOINED%??}
( (
REPO_ROOT="$(dirname "$0")"/.. REPO_ROOT="$(dirname "$0")"/..
cd $REPO_ROOT cd "$REPO_ROOT"
WHITESPACE=$(git grep -n -I -E "^.*[[:space:]]+$" | WHITESPACE=$(git grep -n -I -E "^.*[[:space:]]+$" |
grep -v "test/libsolidity/ASTJSON\|test/libsolidity/ASTRecoveryTests\|test/compilationTests/zeppelin/LICENSE\|${EXCLUDE_FILES_JOINED}" grep -v "test/libsolidity/ASTJSON\|test/libsolidity/ASTRecoveryTests\|test/compilationTests/zeppelin/LICENSE\|${EXCLUDE_FILES_JOINED}"
@ -22,8 +22,8 @@ WHITESPACE=$(git grep -n -I -E "^.*[[:space:]]+$" |
if [[ "$WHITESPACE" != "" ]] 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/report_errors.sh "$ERROR_LOG" scripts/report_errors.sh "$ERROR_LOG"
exit 1 exit 1
fi fi
@ -51,8 +51,8 @@ FORMATERROR=$(
if [[ "$FORMATERROR" != "" ]] 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/report_errors.sh "$ERROR_LOG" scripts/report_errors.sh "$ERROR_LOG"
exit 1 exit 1
fi fi

28
scripts/report_errors.sh
View File

@ -4,16 +4,16 @@ ERROR_LOG="$1"
function report_error_to_github function report_error_to_github
{ {
if [ -z $CIRCLE_PR_NUMBER ] if [ -z "$CIRCLE_PR_NUMBER" ]
then then
CIRCLE_PR_NUMBER="${CIRCLE_PULL_REQUEST//[^0-9]/}" CIRCLE_PR_NUMBER="${CIRCLE_PULL_REQUEST//[^0-9]/}"
fi fi
ERROR_MSG=$(cat $ERROR_LOG) ERROR_MSG=$(cat "$ERROR_LOG")
echo $ERROR_MSG echo "$ERROR_MSG"
if [ ! -z $CI ] if [ ! -z "$CI" ]
then then
echo "posting error message to github" echo "posting error message to github"
post_error_to_github post_error_to_github
@ -25,15 +25,15 @@ function post_error_to_github
{ {
GITHUB_API_URL="https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/issues/$CIRCLE_PR_NUMBER/comments" GITHUB_API_URL="https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/issues/$CIRCLE_PR_NUMBER/comments"
ESCAPED_ERROR_MSG=$(cat -e $ERROR_LOG | sed 's/\\/\\\\/g' | sed 's/"/\\\"/g') ESCAPED_ERROR_MSG=$(cat -e "$ERROR_LOG" | sed 's/\\/\\\\/g' | sed 's/"/\\\"/g')
FORMATTED_ERROR_MSG=$(echo $ESCAPED_ERROR_MSG | sed 's/\$/\\n/g' | tr -d '\n') FORMATTED_ERROR_MSG=$(echo "$ESCAPED_ERROR_MSG" | sed 's/\$/\\n/g' | tr -d '\n')
curl --request POST \ curl --request POST \
--url $GITHUB_API_URL \ --url "$GITHUB_API_URL" \
--header 'accept: application/vnd.github.v3+json' \ --header 'accept: application/vnd.github.v3+json' \
--header 'content-type: application/json' \ --header 'content-type: application/json' \
-u stackenbotten:$GITHUB_ACCESS_TOKEN \ -u "stackenbotten:$GITHUB_ACCESS_TOKEN" \
--data "{\"body\": \"There was an error when running \`$CIRCLE_JOB\` for commit \`$CIRCLE_SHA1\`:\n\`\`\`\n$FORMATTED_ERROR_MSG\n\`\`\`\nPlease check that your changes are working as intended.\"}" --data "{\"body\": \"There was an error when running \`$CIRCLE_JOB\` for commit \`$CIRCLE_SHA1\`:\n\`\`\`\n$FORMATTED_ERROR_MSG\n\`\`\`\nPlease check that your changes are working as intended.\"}"
} }
@ -41,22 +41,22 @@ function post_review_comment_to_github
{ {
GITHUB_API_URL="https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pulls/$CIRCLE_PR_NUMBER/comments" GITHUB_API_URL="https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pulls/$CIRCLE_PR_NUMBER/comments"
sed -i 1d $ERROR_LOG sed -i 1d "$ERROR_LOG"
while read line while read line
do do
ERROR_PATH=$(echo $line | grep -oE ".*\.cpp") ERROR_PATH=$(echo "$line" | grep -oE ".*\.cpp")
ERROR_LINE=$(echo $line | grep -oE "[0-9]*") ERROR_LINE=$(echo "$line" | grep -oE "[0-9]*")
[[ $ERROR_PATH != "" ]] || { echo "ERROR: Error message does not contain file path."; exit 1; } [[ $ERROR_PATH != "" ]] || { echo "ERROR: Error message does not contain file path."; exit 1; }
[[ $ERROR_LINE != "" ]] || { echo "ERROR: Error message does not contain line number."; exit 1; } [[ $ERROR_LINE != "" ]] || { echo "ERROR: Error message does not contain line number."; exit 1; }
curl --request POST \ curl --request POST \
--url $GITHUB_API_URL \ --url "$GITHUB_API_URL" \
--header 'accept: application/vnd.github.v3+json, application/vnd.github.comfort-fade-preview+json' \ --header 'accept: application/vnd.github.v3+json, application/vnd.github.comfort-fade-preview+json' \
--header 'content-type: application/json' \ --header 'content-type: application/json' \
-u stackenbotten:$GITHUB_ACCESS_TOKEN \ -u "stackenbotten:$GITHUB_ACCESS_TOKEN" \
--data "{\"commit_id\": \"$CIRCLE_SHA1\", \"path\": \"$ERROR_PATH\", \"line\": $ERROR_LINE, \"side\": \"RIGHT\", \"body\": \"Coding style error\"}" --data "{\"commit_id\": \"$CIRCLE_SHA1\", \"path\": \"$ERROR_PATH\", \"line\": $ERROR_LINE, \"side\": \"RIGHT\", \"body\": \"Coding style error\"}"
done < $ERROR_LOG done < "$ERROR_LOG"
} }
report_error_to_github report_error_to_github