mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-01 19:13:55 -07:00
travis: separate lint build (#3778)
* Create travis-lint.sh * separate lint * Update travis-lint.sh * Update travis-lint.sh * use default image * call lint externally * add xenial again for tests * Update .travis.yml * fix path * move test to docker build * remove --format argument test / passed * add test label * use bash command * source > execute
This commit is contained in:
parent
2ef3e6fc93
commit
a8b34d51a5
3 changed files with 44 additions and 59 deletions
|
|
@ -54,43 +54,7 @@ done
|
|||
|
||||
# Check formatting using clang-format
|
||||
if [[ $CHECK_FORMAT ]]; then
|
||||
echo "Checking your code using clang-format..."
|
||||
diff="$(./clangify.sh --diff --cf-version)"
|
||||
err=$?
|
||||
case $err in
|
||||
1)
|
||||
cat <<EOM
|
||||
***********************************************************
|
||||
*** ***
|
||||
*** Your code does not comply with our styleguide. ***
|
||||
*** ***
|
||||
*** Please correct it or run the "clangify.sh" script. ***
|
||||
*** Then commit and push those changes to this branch. ***
|
||||
*** Check our CONTRIBUTING.md file for more details. ***
|
||||
*** ***
|
||||
*** Thank you ♥ ***
|
||||
*** ***
|
||||
***********************************************************
|
||||
|
||||
Used clang-format version:
|
||||
${diff%%
|
||||
*}
|
||||
|
||||
The following changes should be made:
|
||||
${diff#*
|
||||
}
|
||||
|
||||
Exiting...
|
||||
EOM
|
||||
exit 2
|
||||
;;
|
||||
0)
|
||||
echo "Thank you for complying with our code standards."
|
||||
;;
|
||||
*)
|
||||
echo "Something went wrong in our formatting checks: clangify returned $err" >&2
|
||||
;;
|
||||
esac
|
||||
source ./.ci/travis-lint.sh
|
||||
fi
|
||||
|
||||
set -e
|
||||
|
|
|
|||
37
.ci/travis-lint.sh
Normal file
37
.ci/travis-lint.sh
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Check formatting using clang-format
|
||||
echo "Checking your code using clang-format..."
|
||||
diff="$(./clangify.sh --diff --cf-version)"
|
||||
err=$?
|
||||
case $err in
|
||||
1)
|
||||
cat <<EOM
|
||||
***********************************************************
|
||||
*** ***
|
||||
*** Your code does not comply with our styleguide. ***
|
||||
*** ***
|
||||
*** Please correct it or run the "clangify.sh" script. ***
|
||||
*** Then commit and push those changes to this branch. ***
|
||||
*** Check our CONTRIBUTING.md file for more details. ***
|
||||
*** ***
|
||||
*** Thank you ♥ ***
|
||||
*** ***
|
||||
***********************************************************
|
||||
Used clang-format version:
|
||||
${diff%%
|
||||
*}
|
||||
The following changes should be made:
|
||||
${diff#*
|
||||
}
|
||||
Exiting...
|
||||
EOM
|
||||
exit 2
|
||||
;;
|
||||
0)
|
||||
echo "Thank you for complying with our code standards."
|
||||
;;
|
||||
*)
|
||||
echo "Something went wrong in our formatting checks: clangify returned $err" >&2
|
||||
;;
|
||||
esac
|
||||
Loading…
Add table
Add a link
Reference in a new issue