]> granicus.if.org Git - python/commitdiff
Fix AppVeyor doc short-circuit (GH-5632)
authorZachary Ware <zachary.ware@gmail.com>
Sun, 11 Feb 2018 21:35:09 +0000 (15:35 -0600)
committerGitHub <noreply@github.com>
Sun, 11 Feb 2018 21:35:09 +0000 (15:35 -0600)
.github/appveyor.yml

index 5239d6ccc17cd99a8af01604298054523046d5e4..b87beda75e0887ec599386717b2dbc56c67604b7 100644 (file)
@@ -14,12 +14,15 @@ before_build:
       } elseif (!$env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT) {
         echo 'Not a PR, doing full build.'
       } else {
-        $mergebase = git merge-base $env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT $env:APPVEYOR_REPO_BRANCH
+        git fetch -q origin +refs/heads/$env:APPVEYOR_REPO_BRANCH
+        $mergebase = git merge-base HEAD FETCH_HEAD
         $changes = git diff --name-only HEAD $mergebase | grep -vE '(\.rst$)|(^Doc)|(^Misc)'
         If (!$changes) {
           echo 'Only docs were updated, stopping build process.'
           Exit-AppveyorBuild
         }
+        echo 'Doing full build due to non-doc changes in these files:'
+        echo $changes
       }