From c6c43f41f1a70e40aca606377ac6da96937ae045 Mon Sep 17 00:00:00 2001
From: JerrettDavis <mxjerrett@gmail.com>
Date: Mon, 20 Apr 2026 22:52:20 -0500
Subject: [PATCH] fix: skip commitlint for PR merge commits

---
 .github/act/push-merge-pr.json  | 11 +++++++++++
 .github/workflows/ci.yml        |  7 ++++---
 tests/test_release_workflows.py |  7 +++++++
 3 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 .github/act/push-merge-pr.json

diff --git a/.github/act/push-merge-pr.json b/.github/act/push-merge-pr.json
new file mode 100644
index 000000000..f0326b984
--- /dev/null
+++ b/.github/act/push-merge-pr.json
@@ -0,0 +1,11 @@
+{
+  "ref": "refs/heads/main",
+  "head_commit": {
+    "message": "Merge pull request #217 from JerrettDavis/fix/openclaw-local-node-publish\n\nFix OpenClaw GPR package build"
+  },
+  "commits": [
+    {
+      "message": "Merge pull request #217 from JerrettDavis/fix/openclaw-local-node-publish\n\nFix OpenClaw GPR package build"
+    }
+  ]
+}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fa3dda675..83700960b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -215,9 +215,10 @@ jobs:
           name: dist
           path: dist/
 
-  commitlint:
-    runs-on: ubuntu-latest
-    steps:
+  commitlint:
+    if: github.event_name != 'push' || !startsWith(github.event.head_commit.message, 'Merge pull request ')
+    runs-on: ubuntu-latest
+    steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
diff --git a/tests/test_release_workflows.py b/tests/test_release_workflows.py
index 168b70fb1..16cdfc3d2 100644
--- a/tests/test_release_workflows.py
+++ b/tests/test_release_workflows.py
@@ -36,3 +36,10 @@ def test_create_release_runs_after_successful_build_even_if_other_publishes_fail
     )
     assert "always()" in content
     assert "needs.build.result == 'success'" in content
+
+
+def test_ci_commitlint_skips_default_github_merge_commits() -> None:
+    content = (ROOT / ".github" / "workflows" / "ci.yml").read_text(encoding="utf-8")
+
+    assert "github.event_name != 'push'" in content
+    assert "!startsWith(github.event.head_commit.message, 'Merge pull request ')" in content