From f542d179420bac00a2de8058401902e23a642354 Mon Sep 17 00:00:00 2001
From: ModeSevenIndustrialSolutions <mwatkins@linuxfoundation.org>
Date: Fri, 26 Sep 2025 15:25:36 +0100
Subject: [PATCH] CI: Update gerrit-merge-cbom.yaml workflow

- Add missing notify dependency to main job
- Add additional inputs under workflow_dispatch

Issue-ID: CIMAN-33
Change-Id: I8659c8834f062d8db96544aba1529038abb1db41
Signed-off-by: ModeSevenIndustrialSolutions <mwatkins@linuxfoundation.org>
---
 .github/workflows/gerrit-merge-cbom.yaml | 45 +++++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/gerrit-merge-cbom.yaml b/.github/workflows/gerrit-merge-cbom.yaml
index 76bf8331a..31e089417 100644
--- a/.github/workflows/gerrit-merge-cbom.yaml
+++ b/.github/workflows/gerrit-merge-cbom.yaml
@@ -5,23 +5,48 @@
 name: '🔑 Generate PQCA CBOM'
 
 on:
+  push:
+    branches:
+      - master
+
   workflow_dispatch:
     inputs:
+      GERRIT_BRANCH:
+        description: "Branch that change is against"
+        required: true
+        type: string
+      GERRIT_CHANGE_ID:
+        description: "The ID for the change"
+        required: true
+        type: string
       GERRIT_CHANGE_NUMBER:
-        description: 'Gerrit change number'
-        required: false
+        description: "The Gerrit number"
+        required: true
+        type: string
+      GERRIT_CHANGE_URL:
+        description: "URL to the change"
+        required: true
+        type: string
+      GERRIT_EVENT_TYPE:
+        description: "Type of Gerrit event"
+        required: true
         type: string
       GERRIT_PATCHSET_NUMBER:
-        description: 'Gerrit patchset number'
-        required: false
+        description: "The patch number for the change"
+        required: true
+        type: string
+      GERRIT_PATCHSET_REVISION:
+        description: "The revision sha"
+        required: true
+        type: string
+      GERRIT_PROJECT:
+        description: "Project in Gerrit"
+        required: true
         type: string
       GERRIT_REFSPEC:
-        description: 'Gerrit refspec'
-        required: false
+        description: "Gerrit refspec of change"
+        required: true
         type: string
-  push:
-    branches:
-      - master
 
 permissions: {}
 
@@ -29,7 +54,6 @@ concurrency:
   group: "gerrit-merge-cbom-${{ github.workflow }}-${{ github.event.inputs.GERRIT_CHANGE_ID || github.run_id }}"
   cancel-in-progress: true
 
-
 jobs:
   notify:
     runs-on: ubuntu-latest
@@ -57,6 +81,7 @@ jobs:
   cbom-create:
     name: 'Generate PQCA CBOM'
     runs-on: ubuntu-latest
+    needs: [notify]
     permissions:
       contents: write
       pull-requests: write
-- 
2.16.6