Rebase only on PRs (#4861)
This commit is contained in:
parent
5bec2edaf7
commit
14141ec137
1 changed files with 6 additions and 4 deletions
|
@ -1,7 +1,9 @@
|
|||
#!/bin/bash
|
||||
set -euxo pipefail
|
||||
|
||||
# Rebase on master to get latest changes
|
||||
git config user.email "ci@kubespray.io"
|
||||
git config user.name "CI"
|
||||
git pull --rebase origin master
|
||||
# Rebase PRs on master to get latest changes
|
||||
if [[ $CI_COMMIT_REF_NAME == pr-* ]]; then
|
||||
git config user.email "ci@kubespray.io"
|
||||
git config user.name "CI"
|
||||
git pull --rebase origin master
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue