From 32f194e1a69b96ba6cf4f6daf2bd39d0e1b7832a Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Sun, 11 Feb 2018 14:00:47 -0600 Subject: [PATCH 1/3] Fix AppVeyor build --- .github/appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/appveyor.yml b/.github/appveyor.yml index a4c11df2795ed19..65466984e01ef4f 100644 --- a/.github/appveyor.yml +++ b/.github/appveyor.yml @@ -14,7 +14,7 @@ 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 + $mergebase = git merge-base $env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT origin/$env:APPVEYOR_REPO_BRANCH $changes = git diff --name-only HEAD $mergebase | grep -vE '(\.rst$)|(^Doc)|(^Misc)' If (!$changes) { echo 'Only docs were updated, stopping build process.' From 611c18dc7f19955cf04443e46958fb5eb06d7a25 Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Sun, 11 Feb 2018 14:44:25 -0600 Subject: [PATCH 2/3] Try again --- .github/appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/appveyor.yml b/.github/appveyor.yml index 65466984e01ef4f..0ba3c0aed3441c4 100644 --- a/.github/appveyor.yml +++ b/.github/appveyor.yml @@ -14,7 +14,8 @@ 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 origin/$env:APPVEYOR_REPO_BRANCH + git fetch origin + $mergebase = git merge-base $env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT refs/heads/$env:APPVEYOR_REPO_BRANCH $changes = git diff --name-only HEAD $mergebase | grep -vE '(\.rst$)|(^Doc)|(^Misc)' If (!$changes) { echo 'Only docs were updated, stopping build process.' From 8e00cbd8785d3b10173b8d2cc77b5fda7323d8e7 Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Sun, 11 Feb 2018 14:49:52 -0600 Subject: [PATCH 3/3] Another try --- .github/appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/appveyor.yml b/.github/appveyor.yml index 0ba3c0aed3441c4..f145d9f280b55f3 100644 --- a/.github/appveyor.yml +++ b/.github/appveyor.yml @@ -14,8 +14,8 @@ before_build: } elseif (!$env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT) { echo 'Not a PR, doing full build.' } else { - git fetch origin - $mergebase = git merge-base $env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT refs/heads/$env:APPVEYOR_REPO_BRANCH + git fetch -q origin +refs/heads/$env:APPVEYOR_REPO_BRANCH + $mergebase = git merge-base $env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT FETCH_HEAD $changes = git diff --name-only HEAD $mergebase | grep -vE '(\.rst$)|(^Doc)|(^Misc)' If (!$changes) { echo 'Only docs were updated, stopping build process.'