From: Matthew Watkins <mwatkins@linuxfoundation.org>
Date: Mon, 5 Jan 2026 16:49:28 +0000 (+0000)
Subject: CI: Update checkout step in gerrit-merge-cbom.yaml
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=9a1b0ef72fccc12a7aaa07392c5e3cc06cbe9c27;p=ccsdk%2Fdistribution.git

CI: Update checkout step in gerrit-merge-cbom.yaml

Fixes manual workflow_dispatch invocation failure to checkout repo
when "Run without Gerrit components" flag/option is selected.

Issue-ID: CIMAN-33
Change-Id: I3700266a858e005a9691c0a3f3b6f13c38be4a9d
Signed-off-by: Matthew Watkins <mwatkins@linuxfoundation.org>
---

diff --git a/.github/workflows/gerrit-merge-cbom.yaml b/.github/workflows/gerrit-merge-cbom.yaml
index fb9efb07..9a04a0dd 100644
--- a/.github/workflows/gerrit-merge-cbom.yaml
+++ b/.github/workflows/gerrit-merge-cbom.yaml
@@ -66,7 +66,7 @@ jobs:
     steps:
       # Harden the runner used by this workflow
       # yamllint disable-line rule:line-length
-      - uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2  # v2.13.3
+      - uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76  # v2.14.0
         with:
           egress-policy: audit
 
@@ -96,17 +96,24 @@ jobs:
     steps:
       # Harden the runner used by this workflow
       # yamllint disable-line rule:line-length
-      - uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2  # v2.13.3
+      - uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76  # v2.14.0
         with:
           egress-policy: audit
 
+      # Checkout for Gerrit generated events
       # yamllint disable-line rule:line-length
-      - uses: lfreleng-actions/checkout-gerrit-change-action@54d751e8bd167bc91f7d665dabe33fae87aaaa63 # v0.9
+      - uses: lfreleng-actions/checkout-gerrit-change-action@54d751e8bd167bc91f7d665dabe33fae87aaaa63  # v0.9
+        if: github.event_name == 'workflow_dispatch' && inputs.GERRIT_DISABLED != true
         with:
           gerrit-refspec: ${{ inputs.GERRIT_REFSPEC }}
           gerrit-url: ${{ vars.GERRIT_URL }}
           delay: "0s"
 
+      # Checkout for manual workflow_dispatch
+      # yamllint disable-line rule:line-length
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8  # v6.0.1
+        if: github.event_name == 'workflow_dispatch' && inputs.GERRIT_DISABLED == true
+
       - name: 'Find Python projects'
         id: find-python
         run: |
@@ -118,14 +125,14 @@ jobs:
               PYTHON_DIRS+=("$dir")
             fi
           done < <(find . -type f \( -name "setup.py" -o -name "pyproject.toml" \))
-          
+
           echo "Found ${#PYTHON_DIRS[@]} Python project(s)"
-          
+
           if [ ${#PYTHON_DIRS[@]} -gt 0 ]; then
             echo "has-python=true" >> "$GITHUB_OUTPUT"
             echo "Python projects found in:"
             printf '%s\n' "${PYTHON_DIRS[@]}"
-            
+
             # Save directories for iteration
             printf '%s\n' "${PYTHON_DIRS[@]}" > /tmp/python_dirs.txt
             echo "DEBUG: has-python output set to: true"
@@ -323,7 +330,7 @@ jobs:
     steps:
       # Harden the runner used by this workflow
       # yamllint disable-line rule:line-length
-      - uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2  # v2.13.3
+      - uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76  # v2.14.0
         with:
           egress-policy: audit