From fe9dee4cf05fe9872de7c112f7603d8690389b6c Mon Sep 17 00:00:00 2001
From: Anahide Tchertchian <608958+atchertchian@users.noreply.github.com>
Date: Fri, 6 Dec 2024 17:09:58 +0100
Subject: [PATCH] AAE-28530 Fix teams notif management of multiple "needs" info
 (#827)

---
 .github/actions/send-teams-notification/action.yml         | 5 +++--
 .../tests/send-teams-notification.bats                     | 7 ++-----
 version.txt                                                | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/actions/send-teams-notification/action.yml b/.github/actions/send-teams-notification/action.yml
index ff6a367ca..b173bfce1 100644
--- a/.github/actions/send-teams-notification/action.yml
+++ b/.github/actions/send-teams-notification/action.yml
@@ -64,8 +64,9 @@ runs:
       env:
         NEEDS: ${{ inputs.needs }}
       run: |
-        NEEDS_OUTPUT=$(echo $NEEDS | jq -r 'to_entries[] | "\(.key): \(.value.result)"')
-        echo "result=$NEEDS_OUTPUT" >> $GITHUB_OUTPUT
+        echo "result<<EOF" >> $GITHUB_OUTPUT
+        echo $NEEDS | jq -r 'to_entries | map([.key, .value.result]|join(": ")) | join("\n\n")' >> $GITHUB_OUTPUT
+        echo "EOF" >> $GITHUB_OUTPUT
 
     - name: Compute message
       id: compute-message
diff --git a/.github/actions/send-teams-notification/tests/send-teams-notification.bats b/.github/actions/send-teams-notification/tests/send-teams-notification.bats
index a290300ac..001d8772e 100644
--- a/.github/actions/send-teams-notification/tests/send-teams-notification.bats
+++ b/.github/actions/send-teams-notification/tests/send-teams-notification.bats
@@ -257,7 +257,7 @@ BATS
 
 @test "needs" {
     export NEEDS_JSON=$(<$BATS_TEST_DIRNAME/sample-needs.json)
-    export NEEDS=$(echo $NEEDS_JSON | jq -r 'to_entries[] | "\(.key): \(.value.result)"')
+    export NEEDS=$(echo $NEEDS_JSON | jq -r 'to_entries | map([.key, .value.result]|join(": ")) | join("\n\n")')
 
     run compute-message.sh
 
@@ -265,14 +265,11 @@ BATS
 
     expected_output=$(cat << 'BATS'
 result<<EOF
-build: success\npromote: failure\n\nfix: update retry inputs to use string type\n\n* use strings\n* add tests
+build: success\n\npromote: failure\n\nfix: update retry inputs to use string type\n\n* use strings\n* add tests
 EOF
 BATS
 )
 
-    echo $output
-    echo $expected_output
-
     [ "$output" = "$expected_output" ]
 
 }
diff --git a/version.txt b/version.txt
index 2dc0523a5..0414a3bad 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v8.6.0
+v8.6.1