From 0f6767f274bb420fdcb9c125b27bea9fc5f5abf6 Mon Sep 17 00:00:00 2001
From: dreis2211 <christoph.dreis@freenet.de>
Date: Wed, 3 Jun 2020 18:31:03 +0200
Subject: [PATCH] Polish Slack notification when no build scan was published

See gh-21673
---
 ci/pipeline.yml | 16 ++++++++--------
 settings.gradle |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 5fb5557899..09990b1423 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -258,7 +258,7 @@ jobs:
           text: >
             :concourse-failed: ${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!
             [<https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|build log>]
-            [<$TEXT_FILE_CONTENT|build scan>]
+            [$TEXT_FILE_CONTENT]
           text_file: git-repo/build/build-scan-uri.txt
           silent: true
           icon_emoji: ":concourse:"
@@ -296,7 +296,7 @@ jobs:
       text: >
         :concourse-succeeded: ${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} was successful!
         [<https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|build log>]
-        [<$TEXT_FILE_CONTENT|build scan>]
+        [$TEXT_FILE_CONTENT]
       text_file: git-repo/build/build-scan-uri.txt
       silent: true
       icon_emoji: ":concourse:"
@@ -358,7 +358,7 @@ jobs:
           text: >
             :concourse-failed: ${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!
             [<https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|build log>]
-            [<$TEXT_FILE_CONTENT|build scan>]
+            [$TEXT_FILE_CONTENT]
           text_file: git-repo/build/build-scan-uri.txt
           silent: true
           icon_emoji: ":concourse:"
@@ -370,7 +370,7 @@ jobs:
       text: >
         :concourse-succeeded: ${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} was successful!
         [<https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|build log>]
-        [<$TEXT_FILE_CONTENT|build scan>]
+        [$TEXT_FILE_CONTENT]
       text_file: git-repo/build/build-scan-uri.txt
       silent: true
       icon_emoji: ":concourse:"
@@ -404,7 +404,7 @@ jobs:
               text: >
                 :concourse-failed: ${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!
                 [<https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|build log>]
-                [<$TEXT_FILE_CONTENT|build scan>]
+                [$TEXT_FILE_CONTENT]
               text_file: git-repo/build/build-scan-uri.txt
               silent: true
               icon_emoji: ":concourse:"
@@ -416,7 +416,7 @@ jobs:
         text: >
           :concourse-succeeded: ${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} was successful!
           [<https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|build log>]
-          [<$TEXT_FILE_CONTENT|build scan>]
+          [$TEXT_FILE_CONTENT]
         text_file: git-repo/build/build-scan-uri.txt
         silent: true
         icon_emoji: ":concourse:"
@@ -447,7 +447,7 @@ jobs:
               text: >
                 :concourse-failed: ${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!
                 [<https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|build log>]
-                [<$TEXT_FILE_CONTENT|build scan>]
+                [$TEXT_FILE_CONTENT]
               text_file: git-repo/build/build-scan-uri.txt
               silent: true
               icon_emoji: ":concourse:"
@@ -457,7 +457,7 @@ jobs:
         text: >
           :concourse-succeeded: ${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} was successful!
           [<https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|build log>]
-          [<$TEXT_FILE_CONTENT|build scan>]
+          [$TEXT_FILE_CONTENT]
         text_file: git-repo/build/build-scan-uri.txt
         silent: true
         icon_emoji: ":concourse:"
diff --git a/settings.gradle b/settings.gradle
index de0b4ae7c9..0c5d6d98cf 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -36,10 +36,10 @@ settings.gradle.projectsLoaded {
 			}
 
 			settings.gradle.rootProject.getBuildDir().mkdirs()
-			new File(settings.gradle.rootProject.getBuildDir(), "build-scan-uri.txt").text = "(build scan not generated)"
+			new File(settings.gradle.rootProject.getBuildDir(), "build-scan-uri.txt").text = "build scan not generated"
 
 			buildScanPublished { scan ->
-				new File(settings.gradle.rootProject.getBuildDir(), "build-scan-uri.txt").text = "${scan.buildScanUri}\n"
+				new File(settings.gradle.rootProject.getBuildDir(), "build-scan-uri.txt").text = "<${scan.buildScanUri}|build scan>\n"
 			}
 		}
 	}