From 0d7f1217c13201ac4c04be21b9079714dd88437d Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Thu, 2 Jul 2020 19:59:55 +0200 Subject: [PATCH] Use a more consistent variable for calculating source branch --- .azure-pipelines/templates/steps/tox-steps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/templates/steps/tox-steps.yml b/.azure-pipelines/templates/steps/tox-steps.yml index 427c52d31..9cb84aa3a 100644 --- a/.azure-pipelines/templates/steps/tox-steps.yml +++ b/.azure-pipelines/templates/steps/tox-steps.yml @@ -41,7 +41,7 @@ steps: ln -s $(testFarmPem.secureFilePath) tests/letstest/test-farm.pem condition: contains(variables['TOXENV'], 'test-farm') - bash: | - export TARGET_BRANCH="${BUILD_SOURCEBRANCHNAME}" + export TARGET_BRANCH="${BUILD_SOURCEBRANCH/refs\/(heads|tags)\//}" [ -z "${SYSTEM_PULLREQUEST_TARGETBRANCH}" ] || export TARGET_BRANCH="${SYSTEM_PULLREQUEST_TARGETBRANCH}" env if [[ "${TOXENV}" == *"oldest"* ]]; then