Return correct version in out

Author: laurent-verbruggen-at-kbc

assets/helpers/bitbucket.sh

@@ -123,9 +123,10 @@ bitbucket_pullrequest_progress_comment() {
   # $2: hash of merge commit
   # $3: hash of source commit
   # $4: hash of target commit
-  build_url="$ATC_EXTERNAL_URL/teams/$(rawurlencode $BUILD_TEAM_NAME)/pipelines/$(rawurlencode $BUILD_PIPELINE_NAME)/jobs/$(rawurlencode $BUILD_JOB_NAME)/builds/$(rawurlencode $BUILD_NAME)"
+  build_url_job="$ATC_EXTERNAL_URL/teams/$(rawurlencode $BUILD_TEAM_NAME)/pipelines/$(rawurlencode $BUILD_PIPELINE_NAME)/jobs/$(rawurlencode $BUILD_JOB_NAME)"
+  build_url="${build_url_job}/builds/$(rawurlencode $BUILD_NAME)"
   build_status_pre="[*Build"
-  build_status_post="* **${BUILD_PIPELINE_NAME}-${BUILD_JOB_NAME}** for $2"
+  build_status_post="* at **[${BUILD_PIPELINE_NAME} > ${BUILD_JOB_NAME}]($build_url_job)** for $2"
   if [ "$2" == "$3" ]; then
     build_status_post+=" into $4]"
   else

assets/out

@@ -162,12 +162,16 @@ if [ -n "$comments" ]; then
     fi
 
     # edit timestamp to force new build when rebuild_phrase is included in comments
-    if [ "$skip_verify" == "true" ]; then
+    if [ "$skip_verify" != "true" ]; then
       if echo "$text" | grep -Ec "$rebuild_phrase" > /dev/null; then
         prq_verify_date=$(( ($(echo "$comment" | jq -r '.createdDate') + 500) / 1000))
         skip_verify=true
       fi
     fi
+
+    if [ "$skip_verify" == "true" -a "$commented" == "true" ]; then
+      break
+    fi
   done <<< "$comments"
 fi