From 4b43fc349b6b41e83a1861d4d74ec9cbf0c708fe Mon Sep 17 00:00:00 2001 From: Scott Wittenburg <scott.wittenburg@kitware.com> Date: Wed, 20 Sep 2017 14:06:50 -0600 Subject: [PATCH] Make sure non-pr builds (e.g. master) have a real branch name --- appveyor.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index d0e4f72b4..22ea4e4e4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,7 +22,12 @@ before_build: - cd C:\projects\adios2 - git reset --hard %APPVEYOR_PULL_REQUEST_HEAD_COMMIT% - ps: | - $env:CUSTOM_BUILD_NAME = ("{0}_{1}_vs{2}" -f $env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH, $env:APPVEYOR_BUILD_NUMBER, $env:APPVEYOR_BUILD_WORKER_IMAGE.split()[2] ) + if(Test-Path env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH) { + $env:BUILD_NAME_BRANCH = $env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH + } else { + $env:BUILD_NAME_BRANCH = $env:APPVEYOR_REPO_BRANCH + } + $env:CUSTOM_BUILD_NAME = ("{0}_{1}_vs{2}" -f $env:BUILD_NAME_BRANCH, $env:APPVEYOR_BUILD_NUMBER, $env:APPVEYOR_BUILD_WORKER_IMAGE.split()[2] ) - ctest.exe -VV -S ../adios2/scripts\appveyor\av_default.cmake -Ddashboard_full=OFF -Ddashboard_do_update=true -- GitLab