Skip to content

Commit 8d7fa6d

Browse files
committed
Simplify and clarify the conflict of interest text
This had gotten too convoluted and in any case should permit people to add collection changes for their own projects.
1 parent 731c41c commit 8d7fa6d

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
### Please confirm this pull request meets the following requirements:
33

44
- [ ] I followed the contributing guidelines: <https://github.com/github/explore/blob/main/CONTRIBUTING.md>.
5-
- [ ] I am not the sole author or employee of a company who created either the topic I am modifying/adding or the collection entry I am modifying/adding.
5+
- [ ] This change is not self-promotion.
66

77
### Which change are you proposing?
88

.github/workflows/conflict.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ jobs:
1414
- run: |
1515
echo "In order to review this pull request for acceptance, we need to make sure that all of the prerequisites are satisfied."
1616
echo "This was not checked:"
17-
echo "> I am not the sole author or employee of a company who created either the topic I am modifying/adding or the collection entry I am modifying/adding."
18-
echo "This is a requirement to maintain a high level of independence in this project. Please update if you are able to verify that you meet that requirement."
17+
echo "> This change is not self-promotion.
18+
echo "This is a requirement to maintain a high level of independence in this project. Please update to confirm there is no conflict of interest."
1919
echo "Thank you!"
2020
exit 1
21-
if: contains(github.event.pull_request.body, '- [ ] I am not the sole author or employee of a company who created either the topic I am modifying/adding or the collection entry I am modifying/adding.')
21+
if: contains(github.event.pull_request.body, '- [ ] This change is not self-promotion.')
2222
name: Fail
2323
- run: exit 0
24-
if: contains(github.event.pull_request.body, '- [x] I am not the sole author or employee of a company who created either the topic I am modifying/adding or the collection entry I am modifying/adding.')
24+
if: contains(github.event.pull_request.body, '- [x] This change is not self-promotion.')
2525
name: Succeed

0 commit comments

Comments
 (0)