Commit Graph

3 Commits

Author SHA1 Message Date
PastaPastaPasta
f3cd4046c9
actions: introduce handle_potential_conflicts.py to only warn on true conflicts. Fail CI when there is a conflict (#4655)
* introduce handle_potential_conflicts.py to only warn on true conflicts. Fail CI when there is a conflict

Signed-off-by: Pasta <pasta@dashboost.org>

* remove unneeded input assign

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>

* use dashpay instead of PastaPastaPasta

Signed-off-by: Pasta <pasta@dashboost.org>

* Update .github/workflows/handle_potential_conflicts.py

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>

* more linter fixes

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
2022-01-13 17:26:47 +03:00
PastaPastaPasta
1c925ed3d2
actions: use pull_request_target instead of pull_request, use custom fork (#4647)
* use pull_request_target instead of pull_request

Signed-off-by: Pasta <pasta@dashboost.org>

* use pasta based action 0.1.1

Signed-off-by: Pasta <pasta@dashboost.org>
2021-12-30 22:04:14 +03:00
PastaPastaPasta
58b2605808
actions: implement predict-conflicts actions (#4645)
* add predict-conflicts.yml

* remove commented out permission
2021-12-30 19:32:11 +03:00