Skip to content

Commit 9d2f7ea

Browse files
authored
Merge pull request #4108 from Blargian/trademark_update_2
Legal: run only on pull-request-target for addendum workflow
2 parents e644214 + 84f7733 commit 9d2f7ea

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

.github/workflows/trademark-cla-approval.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ on:
77
description: 'PR number to approve CLA for'
88
required: true
99
type: string
10-
pull_request:
11-
types: [labeled]
1210
pull_request_target:
1311
types: [labeled]
1412

@@ -45,7 +43,7 @@ jobs:
4543
// Determine PR number
4644
if (context.eventName === 'workflow_dispatch') {
4745
prNumber = parseInt('${{ github.event.inputs.pr_number }}');
48-
} else if (context.eventName === 'pull_request' || context.eventName === 'pull_request_target') {
46+
} else if (context.eventName === 'pull_request_target') {
4947
prNumber = context.payload.pull_request.number;
5048
} else {
5149
return;

.github/workflows/trademark-cla-notice.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name: Trademark CLA Notice
33
on:
44
pull_request_target:
55
types: [opened, edited, synchronize]
6-
pull_request_target:
7-
types: [opened, edited, synchronize]
6+
issue_comment:
7+
types: [created]
88

99
# Set repository-level permissions
1010
permissions: write-all
@@ -33,7 +33,7 @@ jobs:
3333

3434
- name: Check if docs changed
3535
id: docs-changed
36-
if: github.event_name == 'pull_request' || github.event_name == 'pull_request_target'
36+
if: github.event_name == 'pull_request_target'
3737
run: |
3838
changed_files=$(git diff --name-only ${{ github.event.pull_request.base.sha}} ${{ github.event.pull_request.head.sha}})
3939
@@ -99,14 +99,14 @@ jobs:
9999
return null;
100100
101101
- name: Post CLA comment and block merge
102-
if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && steps.docs-changed.outputs.requires_cla == 'true'
102+
if: github.event_name == 'pull_request_target' && steps.docs-changed.outputs.requires_cla == 'true'
103103
uses: actions/github-script@v7
104104
with:
105105
github-token: ${{ steps.generate-token.outputs.token || secrets.GITHUB_TOKEN }}
106106
script: |
107107
let prNumber, prAuthor;
108108
109-
if (context.eventName == 'pull_request' || context.eventName == 'pull_request_target') {
109+
if (context.eventName == 'pull_request_target') {
110110
prNumber = context.issue.number;
111111
prAuthor = '${{ github.event.pull_request.user.login }}';
112112
}
@@ -147,7 +147,7 @@ jobs:
147147
comment.body.includes('CLA Agreement Required - MERGE BLOCKED')
148148
);
149149
150-
if (!existingClaComment && (context.eventName === 'pull_request' || context.eventName === 'pull_request_target')) {
150+
if (!existingClaComment && context.eventName === 'pull_request_target') {
151151
const claText = '# Trademark License Addendum\n\n' +
152152
'Merging of this pull request is temporarily blocked. Please \n' +
153153
'read and agree to the Trademark License Addendum below to \n' +

0 commit comments

Comments
 (0)