Commit Graph

11 Commits

Author SHA1 Message Date
UdjinM6
e646fa89f0
fix(ci): yet another 6356 follow-up 2024-10-24 23:05:43 +03:00
UdjinM6
7064eb9104
fix: 6356 follow-up 2024-10-24 22:28:08 +03:00
UdjinM6
c76e398caa
ci: check ff after merge into base branch for PRs 2024-10-24 20:36:41 +03:00
UdjinM6
c3aae9e165
fix: fetch PR head before merging it in "check ff" 2024-10-24 15:20:15 +03:00
UdjinM6
8865686132
fix: adjust conditions in Check Merge Fast-Forward Only action 2024-10-23 22:31:16 +03:00
UdjinM6
52b9fcecb4
fix: can't mix - and : 2024-08-12 17:45:46 +03:00
UdjinM6
2f12f91d39
fix: 6205 follow-up 2024-08-12 17:00:50 +03:00
UdjinM6
2777d30caa
fix(ci): only run some GH actions on PR approval, not on every comment 2024-08-12 16:06:33 +03:00
pasta
5394d63e18
feat: improve merge-check action to leave a comment and label to PRs 2024-08-09 19:44:14 +07:00
UdjinM6
d574ca6197
ci: bump actions/checkout and actions/cache to v3 (#5519)
## Issue being fixed or feature implemented
Should fix warnings like
> The following actions uses node12 which is deprecated and will be
forced to run on node16: actions/checkout@v2, actions/cache@v2. For more
info:
https://github.blog/changelog/2023-06-13-github-actions-all-actions-will-run-on-node16-instead-of-node12-by-default/

https://github.com/dashpay/dash/actions/runs/5705358251?pr=5448
https://github.com/dashpay/dash/actions/runs/5705358315?pr=5448
https://github.com/dashpay/dash/actions/runs/5705358316?pr=5448
https://github.com/dashpay/dash/actions/runs/5715249078?pr=5448

## What was done?

## How Has This Been Tested?

## Breaking Changes


## Checklist:
- [x] 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
- [x] I have assigned this pull request to a milestone
2023-08-01 12:17:40 -05:00
PastaPastaPasta
4ab5b340ec
ci: add ci for merging into master (#5316)
## 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
2023-04-14 16:53:07 -05:00