summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2018-02-11 21:35:09 (GMT)
committerGitHub <noreply@github.com>2018-02-11 21:35:09 (GMT)
commit6ea20fc719dcaf102d2cefa1786f0421514f7a58 (patch)
tree05100cebd6862a5e0742fc99e4337464660d1935
parente14c01037877768a3fe766e50d14993bd5d8a67e (diff)
downloadcpython-6ea20fc719dcaf102d2cefa1786f0421514f7a58.zip
cpython-6ea20fc719dcaf102d2cefa1786f0421514f7a58.tar.gz
cpython-6ea20fc719dcaf102d2cefa1786f0421514f7a58.tar.bz2
Fix AppVeyor doc short-circuit (GH-5632)
-rw-r--r--.github/appveyor.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/.github/appveyor.yml b/.github/appveyor.yml
index 5239d6c..b87beda 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
}