From 4acd3b1ab7a6691d395c0a9ded51ef7d93904f97 Mon Sep 17 00:00:00 2001
From: Brendan O'Bra <brendan@obrafamily.org>
Date: Tue, 12 May 2026 10:38:20 -0700
Subject: [PATCH 1/2] Update coverity_component_incremental_scan.yml

---
 .github/workflows/coverity_component_incremental_scan.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/coverity_component_incremental_scan.yml b/.github/workflows/coverity_component_incremental_scan.yml
index ed68749..c3f6c0f 100644
--- a/.github/workflows/coverity_component_incremental_scan.yml
+++ b/.github/workflows/coverity_component_incremental_scan.yml
@@ -27,9 +27,6 @@ on:
         required: true
       ARTIFACTORY_USER_APIKEY:
         required: true
-      # GITHUB_TOKEN: used to post PR feedback comments
-      GITHUB_TOKEN:
-        required: true
       # GITHUB_TOKENCM: cross-org token — required if customSetup clones private repos
       GITHUB_TOKENCM:
         required: false

From 63fbcdb023abb0c4c3222fda0f3af2fd79ad803c Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 12 May 2026 17:48:01 +0000
Subject: [PATCH 2/2] Use inherited secrets and github.token in coverity
 incremental workflows

Agent-Logs-Url: https://github.com/rdkcentral/firebolt-cpp-transport/sessions/43b1ff2d-15b1-4f14-89b7-e084c1e579cb

Co-authored-by: brendanobra <740575+brendanobra@users.noreply.github.com>
---
 .github/workflows/coverity_component_incremental_scan.yml | 6 +++---
 .github/workflows/coverity_incremental_scan.yml           | 6 +-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/coverity_component_incremental_scan.yml b/.github/workflows/coverity_component_incremental_scan.yml
index c3f6c0f..6c66f4c 100644
--- a/.github/workflows/coverity_component_incremental_scan.yml
+++ b/.github/workflows/coverity_component_incremental_scan.yml
@@ -51,7 +51,7 @@ jobs:
       COVERITY_URL: ${{ vars.COVERITY_URL }}
       COVERITY_USER: ${{ vars.COVERITY_USER }}
       COVERITY_APIKEY: ${{ secrets.COVERITY_APIKEY }}
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      GITHUB_TOKEN: ${{ github.token }}
       COVERITY_PROJECT_NAME: ${{ github.event.repository.name }}
       COVERITY_STREAM_NAME: ${{ github.event.repository.name }}_${{ inputs.branchName }}
       BUILD_COMMAND: ${{ inputs.buildCommand }}
@@ -72,7 +72,7 @@ jobs:
         id: changeset
         uses: actions/github-script@v7
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          github-token: ${{ github.token }}
           script: |
             const pull_number = Number(${{ toJSON(inputs.pullRequestNumber) }});
             if (!Number.isInteger(pull_number) || pull_number <= 0) {
@@ -126,7 +126,7 @@ jobs:
         uses: synopsys-sig/coverity-report-output-v7-json@v0.1.1
         with:
           json-file-path: coverity_dir/coverity-results.json
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          github-token: ${{ github.token }}
           coverity-url: ${{ vars.COVERITY_URL }}
           coverity-project-name: ${{ github.event.repository.name }}
           coverity-username: ${{ vars.COVERITY_USER }}
diff --git a/.github/workflows/coverity_incremental_scan.yml b/.github/workflows/coverity_incremental_scan.yml
index ce24c0b..3dd61c6 100644
--- a/.github/workflows/coverity_incremental_scan.yml
+++ b/.github/workflows/coverity_incremental_scan.yml
@@ -27,8 +27,4 @@ jobs:
       branchName: ${{ github.event.pull_request.base.ref || github.ref_name }}
       buildCommand: sh cov_build.sh
       customSetup: sh build_dependencies.sh
-    secrets:
-      COVERITY_APIKEY: ${{ secrets.COVERITY_APIKEY }}
-      ARTIFACTORY_USER_APIKEY: ${{ secrets.ARTIFACTORY_USER_APIKEY }}
-      GITHUB_TOKEN: ${{ secrets.RDKCM_RDKE }}
-      GITHUB_TOKENCM: ${{ secrets.RDKCM_RDKE }}
+    secrets: inherit