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

Merge pull request #1242 from r2d4/iso-changz 

Only detect iso changes from merge-base on master
pull/1212/merge
Matt Rickard 2017-03-17 15:47:30 -07:00 committed by GitHub
parent 7b28b8123e 2442d8f020
commit e26fa0dcac
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"