Skip to content

Commit 05a8408

Browse files
committed
fixes
1 parent 3c9511f commit 05a8408

File tree

1 file changed

+19
-17
lines changed

1 file changed

+19
-17
lines changed

.github/workflows/trademark-cla.yml

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
pull_number: prNumber
5757
});
5858
59-
const hasIntegrationsChanges = files.some(file =>
59+
const hasDocsChanges = files.some(file =>
6060
file.filename.startsWith('docs/integrations/') ||
6161
file.filename.startsWith('static/images/')
6262
);
@@ -83,12 +83,14 @@ jobs:
8383
8484
return { prNumber, hasDocsChanges, headSha: pr.head.sha, author: pr.user.login, isClickHouseMember };
8585
}
86+
87+
return null;
8688
8789
- name: Post CLA comment and block merge
8890
if: |
89-
# (steps.pr-info.outputs.isClickHouseMember == 'false') &&
90-
((github.event_name == 'pull_request' && steps.docs-changed.outputs.requires_cla == 'true') ||
91-
(github.event_name == 'issue_comment' && steps.pr-info.outputs.has_docs_changes == 'true'))
91+
# (steps.pr-info.outputs.isClickHouseMember == 'false') &&
92+
((github.event_name == 'pull_request' && steps.docs-changed.outputs.requires_cla == 'true') ||
93+
(github.event_name == 'issue_comment' && steps.pr-info.outputs.has_docs_changes == 'true'))
9294
uses: actions/github-script@v7
9395
with:
9496
script: |
@@ -124,23 +126,23 @@ jobs:
124126
<details>
125127
<summary>Click to see Trademark License Addendum</summary>
126128
127-
This Trademark License Addendum (Addendum) shall, if You have opted
129+
This Trademark License Addendum ("Addendum") shall, if You have opted
128130
in by checking the appropriate box that references this Addendum,
129131
supplement the terms of the Individual Contributor License Agreement
130-
between You and the Company (Agreement). Capitalized terms not
132+
between You and the Company ("Agreement"). Capitalized terms not
131133
defined herein shall have the meanings ascribed to them in the
132134
Agreement.
133135
134136
1. Grant of Trademark License. Subject to the terms and conditions
135137
of this Addendum, You grant to the Company a revocable, worldwide,
136138
non-exclusive, non-sublicensable (except for contractors or agents
137-
acting on the Companys behalf, for whose compliance with this
139+
acting on the Company's behalf, for whose compliance with this
138140
Addendum Company agrees to be responsible), royalty-free, and non-transferable
139141
right to display the Partner Trademarks, solely for the purpose of
140-
marketing and promoting your Contribution (i) on the Companys website
142+
marketing and promoting your Contribution (i) on the Company's website
141143
and in any Company in-product integrations page; and (ii) in
142144
marketing, sales, and product materials for Company products.
143-
Partner Trademarks mean Your employers name and any employer
145+
"Partner Trademarks" mean Your employer's name and any employer
144146
brand features (e.g., logo) you submit to the Company in connection with your
145147
Contribution.
146148
2. Legal authority. You represent that you are legally entitled to
@@ -154,26 +156,26 @@ jobs:
154156
conditions:
155157
i. The Company shall use the Partner Trademarks in accordance with
156158
any reasonable trademark usage guidelines You provide;
157-
ii. You may revoke this license at any time upon thirty (30) days
159+
ii. You may revoke this license at any time upon thirty (30) days'
158160
written notice to the Company, after which the Company shall use
159161
commercially reasonable efforts to cease all further public
160162
use of the Partner Trademarks (but may maintain uses in archived
161163
web pages, changelogs, and previously distributed materials).
162164
iii. The Company acknowledges and agrees that it does not own the
163165
Partner Trademarks and that all goodwill derived from the use
164166
of the Partner Trademarks inures solely to benefit of the
165-
Partner Trademarks owner(s).
167+
Partner Trademarks' owner(s).
166168
iv. The Company shall use the Partner Trademarks in a professional
167169
manner consistent with industry standards and shall not use
168170
them in any way that would reasonably be expected to diminish
169-
their value or harm the reputation of the Partner Trademarks
170-
owner(s). The Companys use of Partner Trademarks shall not
171+
their value or harm the reputation of the Partner Trademarks'
172+
owner(s). The Company's use of Partner Trademarks shall not
171173
imply endorsement, sponsorship, or affiliation beyond the
172174
existence of the Contribution in the Company's integration program.
173175
v. The Company will not use the Partner Trademarks in connection
174176
with search engine rankings, ad word purchases, or as part of a
175177
trade name, business name, or Internet domain name.
176-
178+
177179
</details>
178180
179181
**🔒 To unblock this PR, reply with exactly:**
@@ -201,9 +203,9 @@ jobs:
201203
202204
- name: Check CLA agreement and manage merge blocking
203205
if: |
204-
# (steps.pr-info.outputs.isClickHouseMember == 'false') &&
205-
((github.event_name == 'pull_request' && steps.docs-changed.outputs.requires_cla == 'true') ||
206-
(github.event_name == 'issue_comment' && steps.pr-info.outputs.has_docs_changes == 'true'))
206+
# (steps.pr-info.outputs.isClickHouseMember == 'false') &&
207+
((github.event_name == 'pull_request' && steps.docs-changed.outputs.requires_cla == 'true') ||
208+
(github.event_name == 'issue_comment' && steps.pr-info.outputs.has_docs_changes == 'true'))
207209
uses: actions/github-script@v7
208210
with:
209211
script: |

0 commit comments

Comments
 (0)