@@ -17,7 +17,7 @@ permissions: write-all
17
17
jobs :
18
18
process-cla-approval :
19
19
runs-on : ubuntu-latest
20
- if : github.event_name == 'workflow_dispatch' || github.event_name == 'issue_comment' || (github.event_name == 'pull_request_target' && github. event.label.name == 'cla-signed' && github.actor != 'workflow-authentication-public[bot]')
20
+ if : github.event_name == 'workflow_dispatch' || github.event.label.name == 'cla-signed' || github.event_name == 'issue_comment'
21
21
22
22
steps :
23
23
41
41
with :
42
42
github-token : ${{ steps.generate-token.outputs.token || secrets.GITHUB_TOKEN }}
43
43
script : |
44
+ // Exit early if this is the bot adding labels to prevent double execution
45
+ if (context.actor.includes('workflow-authentication-public')) {
46
+ console.log(`Skipping execution for bot actor: ${context.actor}`);
47
+ return;
48
+ }
49
+
44
50
let prNumber;
45
51
let approvedBy;
46
52
let prAuthor;
@@ -272,7 +278,7 @@ jobs:
272
278
PR_NUMBER="${{ steps.process-cla-approval.outputs.pr_number }}"
273
279
APPROVED_BY="${{ steps.process-cla-approval.outputs.approved_by }}"
274
280
275
- echo "Recording manual CLA approval:"
281
+ echo "Recording manual trademark addendum approval:"
276
282
echo " Username: $USERNAME"
277
283
echo " PR Number: $PR_NUMBER"
278
284
echo " Approved by: $APPROVED_BY"
@@ -294,7 +300,7 @@ jobs:
294
300
"approved_by": $approved_by
295
301
}]' cla-signatures.json > tmp.json && mv tmp.json cla-signatures.json
296
302
297
- echo "New CLA approval signature added"
303
+ echo "New trademark adendum signature added"
298
304
else
299
305
echo "Signature already exists for this user and PR"
300
306
fi
@@ -303,7 +309,7 @@ jobs:
303
309
git config user.name "github-actions[bot]"
304
310
git config user.email "github-actions[bot]@users.noreply.github.com"
305
311
git add cla-signatures.json
306
- git commit -m "Add manual CLA approval for @$USERNAME (PR #$PR_NUMBER) by @$APPROVED_BY" || echo "No changes to commit"
312
+ git commit -m "Add manual approval for @$USERNAME (PR #$PR_NUMBER) by @$APPROVED_BY" || echo "No changes to commit"
307
313
git push
308
314
309
- echo "Manual CLA approval recorded successfully"
315
+ echo "Manual trademark addendum approval recorded successfully"
0 commit comments