From de69430e308316026bc976f4f6152ba5eb17fdd5 Mon Sep 17 00:00:00 2001
From: Jakub Buczak <jbuczak@splunk.com>
Date: Fri, 23 Jan 2026 18:16:10 +0100
Subject: [PATCH] bring changes from develop

---
 .github/workflows/cla-check.yml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/cla-check.yml b/.github/workflows/cla-check.yml
index b84ca13b1..238e9c5a7 100644
--- a/.github/workflows/cla-check.yml
+++ b/.github/workflows/cla-check.yml
@@ -22,29 +22,33 @@ jobs:
           PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
         with:
           path-to-signatures: "signatures/version1/cla.json"
-          path-to-document: "https://github.com/splunk/cla-agreement/blob/main/CLA.md" # e.g. a CLA or a DCO document
+          path-to-document: "https://github.com/splunk/cla-agreement/blob/main/CLA.md"
           branch: "main"
           allowlist: dependabot[bot]
           remote-organization-name: splunk
           remote-repository-name: cla-agreement
+          custom-notsigned-prcomment: "<br/>Thank you for your submission, we really appreciate it. Like many open-source projects, we ask that you sign our [Contribution License Agreement](${input.getPathToDocument()}) before we can accept your contribution. You can sign the CLA by just posting a Pull Request Comment same as the below format.<br/>"
+          custom-allsigned-prcomment: "⏳ **CLA signed** — now checking Code of Conduct status..."
   CodeOfConduct:
     runs-on: ubuntu-latest
+    # CLA and COC jobs both edit the same PR comment to show signing status.
+    # Run sequentially to avoid race conditions when updating the comment.
+    needs: ContributorLicenseAgreement
     steps:
       - name: "COC Assistant"
-        if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the Code of Conduct and I hereby accept the Terms') || github.event_name == 'pull_request_target'
+        if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the Code of Conduct and I hereby sign the COC') || github.event_name == 'pull_request_target'
         uses: cla-assistant/github-action@v2.1.3-beta
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
         with:
           path-to-signatures: "signatures/version1/coc.json"
-          path-to-document: "https://github.com/splunk/cla-agreement/blob/main/CODE_OF_CONDUCT.md" # e.g. a COC or a DCO document
+          path-to-document: "https://github.com/splunk/cla-agreement/blob/main/CODE_OF_CONDUCT.md"
           branch: "main"
           allowlist: dependabot[bot]
           remote-organization-name: splunk
           remote-repository-name: cla-agreement
-          custom-pr-sign-comment: "I have read the Code of Conduct and I hereby accept the Terms"
-          create-file-commit-message: "For example: Creating file for storing COC Signatures"
+          custom-pr-sign-comment: "I have read the Code of Conduct and I hereby sign the COC"
           signed-commit-message: "$contributorName has signed the COC in #$pullRequestNo"
-          custom-notsigned-prcomment: "All contributors have NOT signed the COC Document"
-          custom-allsigned-prcomment: "****CLA Assistant Lite bot**** All contributors have signed the COC  ✍️ ✅"
\ No newline at end of file
+          custom-notsigned-prcomment: "<br/>🎉 **CLA signed — one more step to go!**<br/><br/>Please also accept our [Code of Conduct](${input.getPathToDocument()}) by posting a comment in the format below. This helps us maintain a welcoming community.<br/>"
+          custom-allsigned-prcomment: "All contributors have signed required documents ✍️ ✅"
\ No newline at end of file