## Issue being fixed or feature implemented
This adds a check that ensures branches merge cleanly into master via a
ff-only
## What was done?
Added a GitHub action created via gpt-4 :)
## How Has This Been Tested?
https://github.com/PastaPastaPasta/dash/actions/runs/4703432752/jobs/8341923994
and
https://github.com/PastaPastaPasta/dash/actions/runs/4703457936/jobs/8341980146
for expected pass and expected fail
## Breaking Changes
None, should be back ported to v19.x branch when we get the chance.
## Checklist:
<!--- Go over all the following points, and put an `x` in all the boxes
that apply. -->
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have added or updated relevant unit/integration/functional/e2e
tests
- [ ] I have made corresponding changes to the documentation
**For repository code-owners and collaborators only**
- [x] I have assigned this pull request to a milestone
* 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>
* 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>
* feat:add github actions
* add release tag
* multi-arch download
* remove erroneous add command
* install wget properly
* parse tag
* no multi-arch for now
* show vars
* more debug
* show uname
* install certs
* manually mutate tag
* fix syntax
* use env
* remove debug
* try docker meta
* try semver with v
* multi-arch
* remove v
* use tag-match
* match group 1
* prepare for dashpay repo
* optimize dockerfile
* remove unnecessary space
Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
* Update .github/workflows/release_docker_hub.yml
Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
