epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2025-12-14 13:54:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add new Kubernetes version hashes and set default to 1.17.6 (#6183)

Browse Source 
* Add new Kubernetes version hashes and set default to 1.17.6

* Do not rebase against master when commiting a release branch
This commit is contained in:
Florian Ruynat
2020-05-25 11:43:11 +02:00
committed by GitHub
parent 1f4ef0e86e
commit 31094b1768
5 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/scripts/rebase.sh
View File

@@ -1,9 +1,9 @@
#!/bin/bash
set -euxo pipefail
# Rebase PRs on master to get latest changes
# Rebase PRs on release-2.13 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
git pull --rebase origin release-2.13
fi