Skip to content

fix: claude ワークフローの bot 自己トリガーループを防止 #642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
keito4 merged 1 commit into from
Mar 25, 2026
Merged

fix: claude ワークフローの bot 自己トリガーループを防止 #642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/claude-code-review.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ jobs:

claude-review:
# CIが成功した場合のみ実行（Draft PR、Dependabotはスキップ）
if: github.event.pull_request.draft == false && needs.check-ci-status.outputs.ci_passed == 'true' && github.actor != 'dependabot[bot]'
if: github.event.pull_request.draft == false && needs.check-ci-status.outputs.ci_passed == 'true' && github.event.sender.type != 'Bot'
needs: [check-ci-status]
runs-on: ubuntu-latest
timeout-minutes: 20
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/claude.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,35 @@ on:
permissions: {}

concurrency:
<<<<<<< Updated upstream

@chatgpt-codex-connector chatgpt-codex-connector Bot Mar 25, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Remove unresolved conflict markers from workflow

This commit leaves Git conflict markers (for example <<<<<<< Updated upstream) in claude.yml, which makes the workflow file invalid YAML. In this state, GitHub Actions cannot parse the workflow, so the Claude Code automation will fail to trigger on all configured events until the markers are removed and one branch of the conflict is resolved.

Useful? React with 👍 / 👎.

group: claude-${{ github.repository }}-${{ github.event.issue.number || github.event.pull_request.number || github.run_id }}
=======
# イベント種別 + トリガーのコメント/レビューIDを含めることで、
# 同一 PR/Issue 内でも異なるメンションが互いをキャンセルしない
group: >-
claude-${{ github.repository }}-${{
github.event.issue.number
|| github.event.pull_request.number
|| github.run_id
}}-${{
github.event.comment.id
|| github.event.review.id
|| github.run_id
}}
>>>>>>> Stashed changes
Comment on lines +16 to +31

@coderabbitai coderabbitai Bot Mar 25, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
set -euo pipefail

rg -n '^(<<<<<<<|=======|>>>>>>>)' .github/workflows/claude.yml

Repository: keito4/config

Length of output: 1772

Resolve merge-conflict markers to restore workflow validity.

The file contains unresolved merge-conflict markers at lines 16-31 and 38-44 that make the YAML invalid. YAMLlint cannot parse Line 17 due to the syntax errors introduced by these markers. Remove the markers and keep the stashed changes as shown below:

Suggested resolution 
 concurrency:
-<<<<<<< Updated upstream
-  group: claude-${{ github.repository }}-${{ github.event.issue.number || github.event.pull_request.number || github.run_id }}
-=======
   # イベント種別 + トリガーのコメント/レビューIDを含めることで、
   # 同一 PR/Issue 内でも異なるメンションが互いをキャンセルしない
   group: >-
     claude-${{ github.repository }}-${{
       github.event.issue.number
       || github.event.pull_request.number
       || github.run_id
     }}-${{
       github.event.comment.id
       || github.event.review.id
       || github.run_id
     }}
->>>>>>> Stashed changes
   cancel-in-progress: false
   claude:
     # Bot 全般を除外（sender.type で判定するため、Bot 名のハードコードが不要）
     if: |
-<<<<<<< Updated upstream
-      github.actor != 'github-actions[bot]' &&
-      github.actor != 'dependabot[bot]' &&
-      github.actor != 'claude[bot]' &&
-=======
       github.event.sender.type != 'Bot' &&
->>>>>>> Stashed changes
       (
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
<<<<<<< Updated upstream
group: claude-${{ github.repository }}-${{ github.event.issue.number || github.event.pull_request.number || github.run_id }}
=======
# イベント種別 + トリガーのコメント/レビューIDを含めることで、
# 同一 PR/Issue 内でも異なるメンションが互いをキャンセルしない
group: >-
claude-${{ github.repository }}-${{
github.event.issue.number
|| github.event.pull_request.number
|| github.run_id
}}-${{
github.event.comment.id
|| github.event.review.id
|| github.run_id
}}
>>>>>>> Stashed changes
concurrency:
# イベント種別 + トリガーのコメント/レビューIDを含めることで、
# 同一 PR/Issue 内でも異なるメンションが互いをキャンセルしない
group: >-
claude-${{ github.repository }}-${{
github.event.issue.number
|| github.event.pull_request.number
|| github.run_id
}}-${{
github.event.comment.id
|| github.event.review.id
|| github.run_id
}}
cancel-in-progress: false
🧰 Tools
🪛 YAMLlint (1.38.0)

[error] 17-17: syntax error: could not find expected ':'

(syntax)

🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In @.github/workflows/claude.yml around lines 16 - 31, The workflow contains
unresolved git conflict markers (<<<<<<<, =======, >>>>>>>) around the group
declaration which breaks YAML parsing; remove those markers and replace the
simple group line with the stashed-expanded version that builds the group key
using the folded block (>-) and includes the comment/review IDs, i.e. keep the
group declaration that references github.event.issue.number ||
github.event.pull_request.number || github.run_id and appends
github.event.comment.id || github.event.review.id || github.run_id, preserving
the indentation and folded-block syntax so the final YAML has a single valid
group: entry without any conflict markers.

cancel-in-progress: false

jobs:
claude:
# Bot 全般を除外（sender.type で判定するため、Bot 名のハードコードが不要）
if: |
<<<<<<< Updated upstream
github.actor != 'github-actions[bot]' &&
github.actor != 'dependabot[bot]' &&
github.actor != 'claude[bot]' &&
=======
github.event.sender.type != 'Bot' &&
>>>>>>> Stashed changes
(
(github.event_name == 'issue_comment' && contains(github.event.comment.body || '', '@claude') &&
!(github.event.issue.pull_request && github.event.issue.pull_request.url && github.event.issue.draft == true)) ||
Expand Down
Loading