From 641017fb4571724eaa3f2714959f5a9b427f9e4a Mon Sep 17 00:00:00 2001 From: Roy Ivy III Date: Sun, 9 Feb 2020 18:55:47 -0600 Subject: [PATCH] maint/CICD ~ improve PR support for AppVeyor CI builds - change branch and follow-up commit checkout logic to avoid build failures for PR edge cases - note: final branch pointer is still preserved to support correct code coverage attribution --- .appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 2f5b80797..440a47f39 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -21,8 +21,8 @@ matrix: environment: global: FEATURES: "windows" - BUILD_OPTIONS: "--no-default-features" - TEST_OPTIONS: "--no-default-features --no-fail-fast" + BUILD_OPTIONS: "" + TEST_OPTIONS: "--no-fail-fast" matrix: # minimum version @@ -84,8 +84,8 @@ environment: install: # force branch checkout (if knowable), then reset to the specific commit ## (can be needed for accurate code coverage info) # * this allows later apps to see the branch name using standard `git branch` operations, yet always builds the correct specific commit - # * ref: [`@`](https://archive.is/RVpnF) - - if DEFINED APPVEYOR_REPO_BRANCH if /I "%APPVEYOR_REPO_SCM%"=="git" ( git checkout "%APPVEYOR_REPO_BRANCH%" 2>NUL & git reset --hard "%APPVEYOR_REPO_COMMIT%" ) + # * ref: [`@`](https://archive.is/RVpnF) ; note: `git branch -a` may be helpful for debugging edge cases + - if DEFINED APPVEYOR_REPO_BRANCH if /I "%APPVEYOR_REPO_SCM%"=="git" ( git checkout "%APPVEYOR_REPO_BRANCH%" 2>NUL & git reset --hard FETCH_HEAD 2>NUL || git reset --hard "%APPVEYOR_REPO_COMMIT%" ) # ensure CWD is project main directory - cd "%APPVEYOR_BUILD_FOLDER%" # create a working area