summaryrefslogtreecommitdiffstats
path: root/.github/workflows/develop_update.yml
Commit message (Collapse)AuthorAgeFilesLines
* Also disable line ending conversion for merge workflows (#17953)Joel Challis2022-08-081-0/+4
|
* Bump actions/checkout from 2 to 3 (#17496)dependabot[bot]2022-06-291-1/+1
| | | Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Ensure dependent CI workflows run (#16662)Joel Challis2022-03-151-0/+1
|
* Add merge workflow for XAP branch (#16652)Joel Challis2022-03-151-8/+0
| | | | | * Add merge workflow for XAP branch * uncomment
* identify the qmk-botZach White2020-11-221-0/+2
|
* Fix failed develop updates within CI (#11001)Joel Challis2020-11-221-2/+5
| | | | | * Fix inverted logic * skip locked instead of fail
* Rebase develop after a master push (#10812)Zach White2020-11-211-0/+32
* rebase develop after a master push * limit this to qmk/qmk_firmware * change to a merge strategy * GITHUB_TOKEN isn't needed * check for .locked in develop * break up into more steps