2020-06-11 10:50:32 -07:00
|
|
|
#!/usr/bin/env bash
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
cd "$(dirname "$0")/.."
|
|
|
|
|
|
|
|
|
|
source ci/_
|
|
|
|
|
|
2020-06-14 18:15:46 +09:00
|
|
|
(
|
2020-06-14 21:24:10 +09:00
|
|
|
echo --- git diff --check
|
2020-06-14 18:15:46 +09:00
|
|
|
set -x
|
2020-11-09 15:03:44 -08:00
|
|
|
|
|
|
|
|
if [[ -n $CI_BASE_BRANCH ]]
|
|
|
|
|
then branch="$CI_BASE_BRANCH"
|
|
|
|
|
else branch="master"
|
|
|
|
|
fi
|
|
|
|
|
|
2020-06-14 18:15:46 +09:00
|
|
|
# Look for failed mergify.io backports by searching leftover conflict markers
|
|
|
|
|
# Also check for any trailing whitespaces!
|
2020-11-09 15:03:44 -08:00
|
|
|
git fetch origin "$branch"
|
|
|
|
|
git diff "$(git merge-base HEAD "origin/$branch")" --check --oneline
|
2020-06-14 18:15:46 +09:00
|
|
|
)
|
2020-06-11 10:50:32 -07:00
|
|
|
|
2020-06-14 21:16:19 +09:00
|
|
|
echo
|
|
|
|
|
|
2020-06-11 10:50:32 -07:00
|
|
|
_ ci/nits.sh
|
|
|
|
|
_ ci/check-ssh-keys.sh
|
|
|
|
|
|
|
|
|
|
echo --- ok
|
