[Python-checkins] Fix AppVeyor doc short-circuit (GH-5634)
Zachary Ware
webhook-mailer at python.org
Sun Feb 11 17:21:35 EST 2018
https://github.com/python/cpython/commit/db1de759a9caed5f77b9b550ce0085833a1eb05b
commit: db1de759a9caed5f77b9b550ce0085833a1eb05b
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Zachary Ware <zachary.ware at gmail.com>
date: 2018-02-11T16:21:32-06:00
summary:
Fix AppVeyor doc short-circuit (GH-5634)
(cherry picked from commit 6ea20fc719dcaf102d2cefa1786f0421514f7a58)
files:
M .github/appveyor.yml
diff --git a/.github/appveyor.yml b/.github/appveyor.yml
index 6e6a078a1032..e26969664ec2 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
}
More information about the Python-checkins
mailing list