Author | SHA1 | Message | Date |
---|---|---|---|
Joel Challis |
0002b1cc20
|
Also disable line ending conversion for merge workflows (#17953) | 1 year ago |
dependabot[bot] |
58f4e19503
|
Bump actions/checkout from 2 to 3 (#17496)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> |
2 years ago |
Joel Challis |
8bffc61959
|
Ensure dependent CI workflows run (#16662) | 2 years ago |
Joel Challis |
46e85ded47
|
Add merge workflow for XAP branch (#16652)
* Add merge workflow for XAP branch * uncomment |
2 years ago |
Zach White | c731628946 | identify the qmk-bot | 3 years ago |
Joel Challis |
ca9edc5fe3
|
Fix failed develop updates within CI (#11001)
* Fix inverted logic * skip locked instead of fail |
3 years ago |
Zach White |
8ddbb19df1
|
Rebase develop after a master push (#10812)
* 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 |
3 years ago |