gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only force up-to-date lock files on edge

Browse Source
This commit is contained in:
Michael Vines
2020-06-18 10:04:37 -07:00
committed by mergify[bot]
parent 89e0584250
commit a25ea8e774
4 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ci/test-sanity.sh
View File

@ -10,13 +10,8 @@ source ci/_
set -x
# Look for failed mergify.io backports by searching leftover conflict markers
# Also check for any trailing whitespaces!
if [[ -n $BUILDKITE_PULL_REQUEST_BASE_BRANCH ]]; then
base_branch=$BUILDKITE_PULL_REQUEST_BASE_BRANCH
else
base_branch=$BUILDKITE_BRANCH
fi
git fetch origin "$base_branch"
git diff "$(git merge-base HEAD "origin/$base_branch")..HEAD" --check --oneline
git fetch origin "$CI_BASE_BRANCH"
git diff "$(git merge-base HEAD "origin/$CI_BASE_BRANCH")..HEAD" --check --oneline
)
echo