summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2018-02-11 14:21:32 -0800
committerZachary Ware <zachary.ware@gmail.com>2018-02-11 16:21:32 -0600
commitdb1de759a9caed5f77b9b550ce0085833a1eb05b (patch)
treec86a4e5d8b9c37046140d48c0034076ee3930dcb /.github
parent[3.6] Add short-circuit for doc changes to AppVeyor (GH-5628) (diff)
downloadcpython-db1de759a9caed5f77b9b550ce0085833a1eb05b.tar.gz
cpython-db1de759a9caed5f77b9b550ce0085833a1eb05b.tar.bz2
cpython-db1de759a9caed5f77b9b550ce0085833a1eb05b.zip
Fix AppVeyor doc short-circuit (GH-5634)
(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 6e6a078a103..e26969664ec 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
}