From 8e43dee79c86bf56deb98654439016205c470679 Mon Sep 17 00:00:00 2001 From: Jeremy Rimpo Date: Fri, 25 Sep 2020 00:34:23 -0500 Subject: [skip ci] Use PR branch for umbrella repo (if it exists) --- appveyor.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 654ec0e2..4ab86acc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -42,8 +42,10 @@ build_script: New-Item -ItemType Directory -Path ${env:APPVEYOR_BUILD_FOLDER}\modorganizer-build cd c:\projects\modorganizer-umbrella + + ($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH -eq $null) ? ($branch = $env:APPVEYOR_REPO_BRANCH) : ($branch = $env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH) - git checkout $(git show-ref --verify --quiet refs/remotes/origin/${env:APPVEYOR_REPO_BRANCH} || echo '-b') ${env:APPVEYOR_REPO_BRANCH} + git checkout $(git show-ref --verify --quiet refs/remotes/origin/${branch} || echo '-b') ${branch} C:\Python38-x64\python.exe unimake.py -d ${env:APPVEYOR_BUILD_FOLDER}\modorganizer-build -s Appveyor_Build=True -s Feature_Branch=${env:APPVEYOR_REPO_BRANCH} -s override_build_version=${env:APPVEYOR_BUILD_VERSION} -- cgit v1.3.1