summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatric Stout <truebrain@openttd.org>2019-02-09 15:26:28 +0100
committerPatric Stout <truebrain@openttd.org>2019-02-09 15:54:08 +0100
commitb7ed49af337f876954f207329e960dc89edf7bb2 (patch)
treeee42357efb591c00b828b66905cbb8e212bbce05
parent5b74118ae77cd7c931fc833b174522b77cf00737 (diff)
downloadopenttd-b7ed49af337f876954f207329e960dc89edf7bb2.tar.xz
Fix: [AzurePipelines] in case of a Pull Request, use that number (prefix with 'pr') as branchname
Otherwise the branch name is always 'merge', which is not really useful or verbose.
-rw-r--r--azure-pipelines/templates/release-prepare-source.yml13
1 files changed, 12 insertions, 1 deletions
diff --git a/azure-pipelines/templates/release-prepare-source.yml b/azure-pipelines/templates/release-prepare-source.yml
index 22ec126b1..b20bf0b35 100644
--- a/azure-pipelines/templates/release-prepare-source.yml
+++ b/azure-pipelines/templates/release-prepare-source.yml
@@ -5,7 +5,18 @@
steps:
- script: |
set -ex
- git checkout -B ${BUILD_SOURCEBRANCHNAME}
+
+ if [ -n "${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER}" ]; then
+ # We are triggered from a GitHub Pull Request
+ git checkout -B pr${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER}
+ elif [ "${BUILD_SOURCEBRANCHNAME}" = "merge" ] || [ "${BUILD_SOURCEBRANCHNAME}" = "head" ]; then
+ # We are manually triggered based on a GitHub Pull Request
+ PULLREQUESTNUMBER=$(echo ${BUILD_SOURCEBRANCH} | cut -d/ -f3)
+ git checkout -B pr${PULLREQUESTNUMBER}
+ else
+ git checkout -B ${BUILD_SOURCEBRANCHNAME}
+ fi
+
./findversion.sh > .ottdrev
./azure-pipelines/changelog.sh > .changelog
TZ='UTC' date +"%Y-%m-%d %H:%M UTC" > .release_date