blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up test-sanity.sh a bit (#10565)

This commit is contained in:
Ryo Onodera 2020-06-14 21:16:19 +09:00 committed by GitHub
parent f1131dfbbb
commit f5912f3633
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ci/test-sanity.sh
View File

@ -5,9 +5,8 @@ cd "$(dirname "$0")/.."
source ci/_ source ci/_
echo --- prepare git show --check
( (
echo --- git show --check
set -x set -x
# Look for failed mergify.io backports by searching leftover conflict markers # Look for failed mergify.io backports by searching leftover conflict markers
# Also check for any trailing whitespaces! # Also check for any trailing whitespaces!
@ -16,10 +15,12 @@ echo --- prepare git show --check
else else
base_branch=$BUILDKITE_BRANCH base_branch=$BUILDKITE_BRANCH
fi fi
_ git fetch origin "$base_branch" git fetch origin "$base_branch"
_ git show "$(git merge-base HEAD "origin/$base_branch")..HEAD" --check --oneline git show "$(git merge-base HEAD "origin/$base_branch")..HEAD" --check --oneline
) )
echo
_ ci/nits.sh _ ci/nits.sh
_ ci/check-ssh-keys.sh _ ci/check-ssh-keys.sh