Skip to content

Commit

Permalink
Update conflict test to match current PR template (#4070)
Browse files Browse the repository at this point in the history
I updated the PR template but did not change the test here, so it
would not fail unchecked boxes - but also was spuriously failing
checked ones, sometimes?

Relates to #3773, #4031

Co-authored-by: Eric Sorenson <[email protected]>
  • Loading branch information
ahpook and Eric Sorenson authored Nov 28, 2023
1 parent 0048637 commit e121b13
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/conflict.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
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 "Thank you!"
exit 1
if: contains(github.event.pull_request.body, '- [ ] I am not the sole author or employee of a company who created the topic or collection')
if: contains(github.event.pull_request.body, '- [ ] I am not the sole author or employee of a company who created the topic or collection I'm changing.')
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 the topic or collection')
if: contains(github.event.pull_request.body, '- [x] I am not the sole author or employee of a company who created the topic or collection I'm changing.')
name: Succeed

0 comments on commit e121b13

Please sign in to comment.