From 8d7fa6d57a6e334d23cfb3b2a22dff0787acefd4 Mon Sep 17 00:00:00 2001 From: Eric Sorenson Date: Fri, 30 May 2025 15:18:42 -0700 Subject: [PATCH] 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. --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/conflict.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 94e4bff250df..04f2a644dff9 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,7 +2,7 @@ ### Please confirm this pull request meets the following requirements: - [ ] I followed the contributing guidelines: . -- [ ] 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. +- [ ] This change is not self-promotion. ### Which change are you proposing? diff --git a/.github/workflows/conflict.yml b/.github/workflows/conflict.yml index b1b0fb064c13..34ee2b793ed6 100644 --- a/.github/workflows/conflict.yml +++ b/.github/workflows/conflict.yml @@ -14,12 +14,12 @@ jobs: - run: | echo "In order to review this pull request for acceptance, we need to make sure that all of the prerequisites are satisfied." echo "This was not checked:" - 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." - 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." + echo "> This change is not self-promotion. + 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." echo "Thank you!" exit 1 - 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.') + if: contains(github.event.pull_request.body, '- [ ] This change is not self-promotion.') name: Fail - run: exit 0 - 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.') + if: contains(github.event.pull_request.body, '- [x] This change is not self-promotion.') name: Succeed