summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2018-02-11 14:29:11 -0800
committerZachary Ware <zachary.ware@gmail.com>2018-02-11 16:29:11 -0600
commit2cf880498ac1d817914d4f87fe14d1a3cd6aaa0f (patch)
tree7322a01d9e55558ad7635457e0af22bb0bb752f1 /.github
parent239e13b3b8af05fe860427c62982f390613086d5 (diff)
downloadcpython-git-2cf880498ac1d817914d4f87fe14d1a3cd6aaa0f.tar.gz
Fix AppVeyor doc short-circuit (GH-5635)
(cherry picked from commit 6ea20fc719dcaf102d2cefa1786f0421514f7a58)
Diffstat (limited to '.github')
-rw-r--r--.github/appveyor.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/.github/appveyor.yml b/.github/appveyor.yml
index fa614dbf9b..c69e0ad2c4 100644
--- a/.github/appveyor.yml
+++ b/.github/appveyor.yml
@@ -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
}