Skip to content

Commit 35331ca

Browse files
BlargianBlargian
committed
testing git workflows is a nightmare
1 parent c38a2ff commit 35331ca

File tree

1 file changed

+60
-65
lines changed

1 file changed

+60
-65
lines changed

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

Lines changed: 60 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -146,71 +146,66 @@ jobs:
146146
);
147147
148148
if (!existingClaComment && context.eventName === 'pull_request') {
149-
const claText = '# Trademark License Addendum
150-
151-
Merging of this pull request is temporarily blocked. Please
152-
read and agree to the Trademark License Addendum below to
153-
unblock merging of this pull request.
154-
155-
<details>
156-
<summary>Click to see Trademark License Addendum</summary>
157-
158-
This Trademark License Addendum ("Addendum") shall, if You have opted
159-
in by replying to the comment that references this Addendum that you
160-
have read and agree to theContributor License Agreement Addendum,
161-
supplement the terms of the Individual Contributor License Agreement
162-
between You and the Company ("Agreement"). Capitalized terms not
163-
defined herein shall have the meanings ascribed to them in the
164-
Agreement.
165-
166-
1. Grant of Trademark License. Subject to the terms and conditions
167-
of this Addendum, You grant to the Company a revocable, worldwide,
168-
non-exclusive, non-sublicensable (except for contractors or agents
169-
acting on the Company's behalf, for whose compliance with this
170-
Addendum Company agrees to be responsible), royalty-free, and non-transferable
171-
right to display the Partner Trademarks, solely for the purpose of
172-
marketing and promoting your Contribution (i) on the Company's website
173-
and in any Company in-product integrations page; and (ii) in marketing, sales,
174-
and product materials for Company products. “Partner Trademarks” mean Your
175-
employer’s name and any employer brand features (e.g., logo) You submit now or
176-
in the future to the Company in connection with your Contributions.
177-
2. Legal authority. You represent that you are legally entitled to
178-
grant the above license. If your employer(s) has rights to
179-
intellectual property in the Partner Trademarks, you represent that
180-
you have received permission to grant the above license on behalf
181-
of that employer, or that your employer has executed a separate
182-
agreement with the Company concerning the subject matter of this
183-
Addendum.
184-
3. Conditions. The license in Section 1 is subject to the following
185-
conditions:
186-
i. The Company shall use the Partner Trademarks in accordance with
187-
any reasonable trademark usage guidelines You provide;
188-
ii. You may revoke this license at any time upon thirty (30) days'
189-
written notice to the Company, after which the Company shall use
190-
commercially reasonable efforts to cease all further public
191-
use of the Partner Trademarks (but may maintain uses in archived
192-
web pages, changelogs, and previously distributed materials).
193-
iii. The Company acknowledges and agrees that it does not own the
194-
Partner Trademarks and that all goodwill derived from the use
195-
of the Partner Trademarks inures solely to benefit of the
196-
Partner Trademarks' owner(s).
197-
iv. The Company shall use the Partner Trademarks in a professional
198-
manner consistent with industry standards and shall not use
199-
them in any way that would reasonably be expected to diminish
200-
their value or harm the reputation of the Partner Trademarks'
201-
owner(s). The Company's use of Partner Trademarks shall not
202-
imply endorsement, sponsorship, or affiliation beyond the
203-
existence of the Contribution in the Company's integration program.
204-
v. The Company will not use the Partner Trademarks in connection
205-
with search engine rankings, ad word purchases, or as part of a
206-
trade name, business name, or Internet domain name.
207-
208-
</details>
209-
210-
**To unblock this PR, reply with exactly:**' + ````
211-
I agree to the Trademark License Addendum
212-
CLA-SIGNATURE: ${prAuthor}
213-
````;
149+
const claText = '# Trademark License Addendum\n\n' +
150+
'Merging of this pull request is temporarily blocked. Please \n' +
151+
'read and agree to the Trademark License Addendum below to \n' +
152+
'unblock merging of this pull request.\n\n' +
153+
'<details>\n' +
154+
'<summary>Click to see Trademark License Addendum</summary>\n\n' +
155+
'This Trademark License Addendum ("Addendum") shall, if You have opted \n' +
156+
'in by replying to the comment that references this Addendum that you\n' +
157+
'have read and agree to theContributor License Agreement Addendum,\n' +
158+
'supplement the terms of the Individual Contributor License Agreement\n' +
159+
'between You and the Company ("Agreement"). Capitalized terms not\n' +
160+
'defined herein shall have the meanings ascribed to them in the \n' +
161+
'Agreement.\n\n' +
162+
'1. Grant of Trademark License. Subject to the terms and conditions \n' +
163+
'of this Addendum, You grant to the Company a revocable, worldwide,\n' +
164+
'non-exclusive, non-sublicensable (except for contractors or agents\n' +
165+
'acting on the Company\'s behalf, for whose compliance with this \n' +
166+
'Addendum Company agrees to be responsible), royalty-free, and non-transferable\n' +
167+
'right to display the Partner Trademarks, solely for the purpose of\n' +
168+
'marketing and promoting your Contribution (i) on the Company\'s website\n' +
169+
'and in any Company in-product integrations page; and (ii) in marketing, sales,\n' +
170+
'and product materials for Company products. "Partner Trademarks" mean Your \n' +
171+
'employer\'s name and any employer brand features (e.g., logo) You submit now or \n' +
172+
'in the future to the Company in connection with your Contributions.\n' +
173+
'2. Legal authority. You represent that you are legally entitled to\n' +
174+
'grant the above license. If your employer(s) has rights to \n' +
175+
'intellectual property in the Partner Trademarks, you represent that\n' +
176+
'you have received permission to grant the above license on behalf \n' +
177+
'of that employer, or that your employer has executed a separate \n' +
178+
'agreement with the Company concerning the subject matter of this \n' +
179+
'Addendum.\n' +
180+
'3. Conditions. The license in Section 1 is subject to the following\n' +
181+
'conditions:\n' +
182+
'i. The Company shall use the Partner Trademarks in accordance with\n' +
183+
' any reasonable trademark usage guidelines You provide;\n' +
184+
'ii. You may revoke this license at any time upon thirty (30) days\'\n' +
185+
' written notice to the Company, after which the Company shall use\n' +
186+
' commercially reasonable efforts to cease all further public\n' +
187+
' use of the Partner Trademarks (but may maintain uses in archived\n' +
188+
' web pages, changelogs, and previously distributed materials).\n' +
189+
'iii. The Company acknowledges and agrees that it does not own the \n' +
190+
' Partner Trademarks and that all goodwill derived from the use \n' +
191+
' of the Partner Trademarks inures solely to benefit of the \n' +
192+
' Partner Trademarks\' owner(s).\n' +
193+
'iv. The Company shall use the Partner Trademarks in a professional\n' +
194+
' manner consistent with industry standards and shall not use \n' +
195+
' them in any way that would reasonably be expected to diminish \n' +
196+
' their value or harm the reputation of the Partner Trademarks\' \n' +
197+
' owner(s). The Company\'s use of Partner Trademarks shall not \n' +
198+
' imply endorsement, sponsorship, or affiliation beyond the \n' +
199+
' existence of the Contribution in the Company\'s integration program.\n' +
200+
'v. The Company will not use the Partner Trademarks in connection \n' +
201+
' with search engine rankings, ad word purchases, or as part of a\n' +
202+
' trade name, business name, or Internet domain name.\n\n' +
203+
'</details>\n\n' +
204+
'**To unblock this PR, reply with exactly:**\n' +
205+
'```\n' +
206+
'I agree to the Trademark License Addendum\n' +
207+
'CLA-SIGNATURE: ' + prAuthor + '\n' +
208+
'```';
214209
215210
await github.rest.issues.createComment({
216211
issue_number: prNumber,

0 commit comments

Comments
 (0)