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

resolving buildkite pull before push issue 

Added:
git config pull.rebase false
git pull origin master --allow-unrelated-histories
This commit is contained in:
axleiro 2021-12-08 13:43:59 +05:30 committed by GitHub
parent 483f5cce46
commit f98e198dcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ci/dependabot-pr.sh
View File

@ -25,12 +25,13 @@ api_base="https://api.github.com/repos/solana-labs/solana/pulls"
pr_num=$(echo "$BUILDKITE_BRANCH" | grep -Eo '[0-9]+')
branch=$(curl -s "$api_base/$pr_num" | python3 -c 'import json,sys;print(json.load(sys.stdin)["head"]["ref"])')
git pull
git add :**/Cargo.lock
EMAIL="dependabot-buildkite@noreply.solana.com" \
GIT_AUTHOR_NAME="$name" \
GIT_COMMITTER_NAME="$name" \
git commit -m "[auto-commit] Update all Cargo lock files"
git config pull.rebase false
git pull origin master --allow-unrelated-histories
git push origin "HEAD:$branch"
echo "Source branch is updated; failing this build for the next"