kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Only detect iso changes from merge-base on master 

When new iso changes are commited to master, don't count them as diffs
with old PRs that haven't been rebased.  That way, we don't rebuild the
iso for PRs that don't contain the upstream fixes yet.
pull/1242/head
Matt Rickard 2017-03-14 13:50:08 -07:00
parent f67e900e18
commit 2442d8f020
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/jenkins/minikube_cross_build_and_upload.sh
View File

@ -27,7 +27,7 @@ gsutil cp gs://minikube-builds/logs/index.html gs://minikube-builds/logs/${ghprb
# If there are ISO changes, build and upload the ISO
# then set the default to the newly built ISO for testing
if out="$(git diff origin/master --name-only | grep deploy/iso/minikube)" &> /dev/null; then
if out="$(git diff ${ghprbActualCommit} --name-only $(git merge-base origin/master ${ghprbActualCommit}) | grep deploy/iso/minikube)" &> /dev/null; then
echo "ISO changes detected ... rebuilding ISO"
export ISO_BUCKET="minikube-builds/${ghprbPullId}"
export ISO_VERSION="testing"