C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Auto detect github target branch in rebase script (#6187)

Browse source
This commit is contained in:
Florian Ruynat 2020-05-28 21:37:15 +02:00 committed by GitHub
parent 45d8797dce
commit 71d476b121
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/scripts/rebase.sh
View file

@ -1,9 +1,15 @@
#!/bin/bash #!/bin/bash
set -euxo pipefail set -euxo pipefail
# Rebase PRs on master to get latest changes KUBESPRAY_NEXT_VERSION=2.$(( ${KUBESPRAY_VERSION:3:2} + 1 ))
# Rebase PRs on master (or release branch) to get latest changes
if [[ $CI_COMMIT_REF_NAME == pr-* ]]; then if [[ $CI_COMMIT_REF_NAME == pr-* ]]; then
git config user.email "ci@kubespray.io" git config user.email "ci@kubespray.io"
git config user.name "CI" git config user.name "CI"
if [[ -z "`git branch -a --list origin/release-$KUBESPRAY_NEXT_VERSION`" ]]; then
git pull --rebase origin master git pull --rebase origin master
else
git pull --rebase origin release-$KUBESPRAY_NEXT_VERSION
fi
fi fi