From 1029af50e74382ebbe9dc998ea0339731f96aff8 Mon Sep 17 00:00:00 2001
From: Rahul Kar <118818625+kar-rahul-aws@users.noreply.github.com>
Date: Tue, 28 Nov 2023 10:42:08 +0530
Subject: [PATCH 1/2] Revert "The curl command to send the report expects the
 tar file to be in its current directory. The step either needed to have the
 working-directory: set to the build directory, or the tar file needs to be
 created in the parent directory. (#903)"

This reverts commit 76f3aa5b05e5c38e423e83eea23f5b34c15d3316.
---
 .github/workflows/coverity_scan.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/coverity_scan.yml b/.github/workflows/coverity_scan.yml
index 21e7359f6e..5fa15f7369 100644
--- a/.github/workflows/coverity_scan.yml
+++ b/.github/workflows/coverity_scan.yml
@@ -61,8 +61,7 @@ jobs:
           cmake -S ./examples/cmake_example/ -B build
           cd build
           cov-build --dir cov-int make -j
-          # Move the report out of the build directory
-          tar czvf ../gcc_freertos_kernel_sample_build.tgz cov-int
+          tar czvf gcc_freertos_kernel_sample_build.tgz cov-int
 
           COV_SCAN_UPLOAD_STATUS=$(curl --form token=${COVERITY_TOKEN} \
             --form email=${COVERITY_EMAIL} \

From 5bde28d5f596b4878190b2d7cb1378f99ea91ea5 Mon Sep 17 00:00:00 2001
From: tony-josi-aws <tonyjosi@amazon.com>
Date: Tue, 28 Nov 2023 12:13:15 +0530
Subject: [PATCH 2/2] Update to separate build and upload steps

---
 .github/workflows/coverity_scan.yml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/coverity_scan.yml b/.github/workflows/coverity_scan.yml
index 5fa15f7369..85db518008 100644
--- a/.github/workflows/coverity_scan.yml
+++ b/.github/workflows/coverity_scan.yml
@@ -49,7 +49,7 @@ jobs:
           echo -e "${{ env.bashPass }} ${{ env.stepName }} ${{ env.bashEnd }} "
 
       - env:
-          stepName: Coverity Build & Upload for Scan
+          stepName: Coverity Build
           COVERITY_TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
           COVERITY_EMAIL: ${{ secrets.COVERITY_SCAN_EMAIL }}
         shell: bash
@@ -61,7 +61,20 @@ jobs:
           cmake -S ./examples/cmake_example/ -B build
           cd build
           cov-build --dir cov-int make -j
-          tar czvf gcc_freertos_kernel_sample_build.tgz cov-int
+          # Move the report out of the build directory
+          tar czvf ../gcc_freertos_kernel_sample_build.tgz cov-int
+
+          echo "::endgroup::"
+          echo -e "${{ env.bashPass }} ${{ env.stepName }} ${{ env.bashEnd }} "
+
+      - env:
+          stepName: Upload Coverity Report for Scan
+          COVERITY_TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
+          COVERITY_EMAIL: ${{ secrets.COVERITY_SCAN_EMAIL }}
+        shell: bash
+        run: |
+          # ${{ env.stepName }}
+          echo -e "::group::${{ env.bashInfo }} ${{ env.stepName }} ${{ env.bashEnd }}"
 
           COV_SCAN_UPLOAD_STATUS=$(curl --form token=${COVERITY_TOKEN} \
             --form email=${COVERITY_EMAIL} \