Skip to content

ci: should cause failures #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: comment-on-conflict
Choose a base branch
from
Open

ci: should cause failures #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ef833f
ci: comment on PR when there are potential conflicts
PastaPastaPasta Apr 14, 2023
5241ff1
test?
PastaPastaPasta Apr 14, 2023
5bdcde4
test?
PastaPastaPasta Apr 14, 2023
6625ebf
ci: should cause failures
PastaPastaPasta Apr 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion .github/workflows/predict-conflicts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,25 @@ jobs:
uses: PastaPastaPasta/[email protected]
with:
ghToken: "${{ secrets.GITHUB_TOKEN }}"
id: conflicts-check

- name: validate potential conflicts
run: wget https://raw.githubusercontent.com/dashpay/dash/develop/.github/workflows/handle_potential_conflicts.py && pip3 install hjson && python3 handle_potential_conflicts.py "$conflicts"
run: echo $test && echo $conflicts && wget https://raw.githubusercontent.com/dashpay/dash/develop/.github/workflows/handle_potential_conflicts.py && pip3 install hjson && python3 handle_potential_conflicts.py "$conflicts"
# env:
# conflicts: ${{ steps.conflicts-check.outputs.conflicts }}

- name: comment on PR if there are conflicting PRs
if: steps.conflicts-check.outputs.conflictingPrs != ''
uses: actions/github-script@v5
with:
script: |
const prNumber = context.payload.pull_request.number;
const conflictingPrs = `${{ steps.conflicts-check.outputs.conflictingPrs }}`;
const comment = `Conflicting PRs: ${conflictingPrs}`;
await github.rest.issues.createComment({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: prNumber,
body: comment,
});
github-token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 2 additions & 0 deletions conflict
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
A