Skip to content

Commit d393558

Browse files
Align claude-review workflow with main after merge.
Prefer main's workflow behavior for out-of-scope conflict changes. Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 5aa0b93 commit d393558

1 file changed

Lines changed: 3 additions & 28 deletions

File tree

.github/workflows/claude-review.yml

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,51 +7,26 @@ permissions:
77
on:
88
pull_request_target:
99
types: [opened, ready_for_review]
10-
pull_request_review:
11-
types: [submitted]
1210

1311
concurrency:
1412
group: claude-review-${{ github.event.pull_request.html_url }}
1513
cancel-in-progress: true
1614

1715
jobs:
1816
validate:
19-
if: github.event_name == 'pull_request_target'
2017
uses: ./.github/workflows/contributorValidationGate.yml
2118
with:
2219
PR_NUMBER: ${{ github.event.pull_request.number }}
2320
PR_AUTHOR: ${{ github.event.pull_request.user.login }}
2421
AUTHOR_ASSOCIATION: ${{ github.event.pull_request.author_association }}
2522

26-
checkCPlusApproval:
27-
if: github.event_name == 'pull_request_review' && github.event.review.state == 'approved'
28-
runs-on: blacksmith-2vcpu-ubuntu-2404
29-
outputs:
30-
IS_CPLUS: ${{ steps.check.outputs.IS_CPLUS }}
31-
steps:
32-
- name: Checkout repository
33-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
34-
with:
35-
fetch-depth: 1
36-
37-
- name: Check Contributor+ membership
38-
id: check
39-
uses: ./.github/actions/composite/isContributorPlus
40-
with:
41-
USERNAME: ${{ github.event.review.user.login }}
42-
OS_BOTIFY_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
43-
4423
review:
45-
needs: [validate, checkCPlusApproval]
24+
needs: [validate]
4625
if: |
47-
!cancelled()
26+
needs.validate.outputs.IS_AUTHORIZED == 'true'
4827
&& github.event.pull_request.draft != true
4928
&& !contains(github.event.pull_request.title, 'Revert')
50-
&& (
51-
(github.event_name == 'pull_request_target' && needs.validate.outputs.IS_AUTHORIZED == 'true')
52-
|| (github.event_name == 'pull_request_review' && needs.checkCPlusApproval.outputs.IS_CPLUS == 'true')
53-
)
54-
runs-on: blacksmith-2vcpu-ubuntu-2404
29+
runs-on: ubuntu-latest
5530
env:
5631
PR_NUMBER: ${{ github.event.pull_request.number }}
5732
steps:

0 commit comments

Comments
 (0)