CI: Fix version naming issues

Author: dg0yt

ci/release-notes.yml

@@ -32,7 +32,7 @@ steps:
     set -e
     MAPPER_RELEASE=${BUILD_SOURCEBRANCHNAME}-v${BUILD_BUILDNUMBER}
     ISSUES_BADGE=
-    case "${BUILD_SOURCEBRANCH}" in
+    case "${BUILD_SOURCEBRANCHNAME}" in
     release)
       MAPPER_RELEASE=v0.x.x
       BADGE_LABEL="Official release"

ci/setup-common.yml

@@ -29,13 +29,17 @@
 
 steps:
 - bash: |
-    if [ "${BUILD_SOURCEBRANCH}" = "release" ] ; then
-      # Release build: version to be inserted by Mapper build system
-      echo "##vso[task.setVariable variable=VERSION_DISPLAY]"
+    if [ "${BUILD_REASON}" = "PullRequest" ] ; then
+      # Pull request display version: full source branch + build number
+      VERSION_DISPLAY="${BUILD_SOURCEBRANCH} v${BUILD_BUILDNUMBER}"
+    elif [ "${BUILD_SOURCEBRANCHNAME}" = "release" ] ; then
+      # Release build display version: left to Mapper build system
+      VERSION_DISPLAY=""
     else
-      # Default display version: full source branch and build number
-      echo "##vso[task.setVariable variable=VERSION_DISPLAY]${BUILD_SOURCEBRANCH} v${BUILD_BUILDNUMBER}"
+      # Default display version: source branch name + build number
+      VERSION_DISPLAY="${BUILD_SOURCEBRANCHNAME} v${BUILD_BUILDNUMBER}"
     fi
+    echo "##vso[task.setVariable variable=VERSION_DISPLAY]${VERSION_DISPLAY}"
     echo "##vso[task.setVariable variable=SOURCE_DIR]${BUILD_SOURCESDIRECTORY}"
     echo "##vso[task.setVariable variable=TEST_RESULTS]${BUILD_SOURCESDIRECTORY}/build/default/openorienteering-mapper-ci/Testing"
     echo "##vso[task.setVariable variable=CMAKE_WRAPPING]-E env bash ${BUILD_SOURCESDIRECTORY}/ci/shell.sh cmake"
@@ -44,7 +48,7 @@ steps:
     if [ -z "${OUTPUT_SUFFIX}" ] ; then
       echo "##vso[task.setVariable variable=OUTPUT_SUFFIX]${TARGET_SUFFIX}"
     fi
-    if [ -z "${APP_ID_SUFFIX}" ] ; then
+    if [ -z "${APP_ID_SUFFIX}" -a -n "${VERSION_DISPLAY}" ] ; then
       echo "##vso[task.setVariable variable=APP_ID_SUFFIX].${BUILD_SOURCEBRANCHNAME}"
     fi
     env | sort