github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #15497 from zmerlynn/fix_cherry_pick 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2015-10-19 23:09:21 -07:00
parent 1f28ef05de 21db47a309
commit a66ab00f44
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hack/cherry_pick_pull.sh
View File

@ -76,11 +76,12 @@ if ! git log -n1 --format=%H "${BRANCH}" >/dev/null 2>&1; then
fi fi
declare -r NEWBRANCHREQ="automated-cherry-pick-of-${PULLDASH}" # "Required" portion for tools. declare -r NEWBRANCHREQ="automated-cherry-pick-of-${PULLDASH}" # "Required" portion for tools.
declare -r NEWBRANCH="$(echo ${NEWBRANCHREQ}-${BRANCH} | sed 's/\//-/g')" declare -r NEWBRANCH="$(echo "${NEWBRANCHREQ}-${BRANCH}" | sed 's/\//-/g')"
declare -r NEWBRANCHUNIQ="${NEWBRANCH}-$(date +%s)" declare -r NEWBRANCHUNIQ="${NEWBRANCH}-$(date +%s)"
echo "+++ Creating local branch ${NEWBRANCHUNIQ}" echo "+++ Creating local branch ${NEWBRANCHUNIQ}"
cleanbranch="" cleanbranch=""
prtext=""
gitamcleanup=false gitamcleanup=false
function return_to_kansas { function return_to_kansas {
echo "" echo ""
@ -92,6 +93,9 @@ function return_to_kansas {
if [[ -n "${cleanbranch}" ]]; then if [[ -n "${cleanbranch}" ]]; then
git branch -D "${cleanbranch}" >/dev/null 2>&1 || true git branch -D "${cleanbranch}" >/dev/null 2>&1 || true
fi fi
if [[ -n "${prtext}" ]]; then
rm "${prtext}"
fi
} }
trap return_to_kansas EXIT trap return_to_kansas EXIT
@ -134,13 +138,21 @@ done
gitamcleanup=false gitamcleanup=false
function make-a-pr() { function make-a-pr() {
local rel=$(basename ${BRANCH}) local rel="$(basename "${BRANCH}")"
echo "+++ Creating a pull request on github" echo "+++ Creating a pull request on github"
hub pull-request -F- -h "${GITHUB_USER}:${NEWBRANCH}" -b "kubernetes:${rel}" <<EOF
# This looks like an unnecessary use of a tmpfile, but it avoids
# https://github.com/github/hub/issues/976 Otherwise stdin is stolen
# when we shove the heredoc at hub directly, tickling the ioctl
# crash.
prtext="$(mktemp)" # cleaned in return_to_kansas
cat >"${prtext}" <<EOF
Automated cherry pick of ${PULLSUBJ} Automated cherry pick of ${PULLSUBJ}
Cherry pick of ${PULLSUBJ} on ${rel}. Cherry pick of ${PULLSUBJ} on ${rel}.
EOF EOF
hub pull-request -F"${prtext}" -h "${GITHUB_USER}:${NEWBRANCH}" -b "kubernetes:${rel}"
} }
if git remote -v | grep ^origin | grep kubernetes/kubernetes.git; then if git remote -v | grep ^origin | grep kubernetes/kubernetes.git; then