summaryrefslogtreecommitdiff
path: root/.github/workflows/develop_update.yml
AgeCommit message (Collapse)Author
2022-12-23Lock down workflow permissions. (#19406)Nick Brassel
Co-authored-by: Joel Challis <git@zvecr.com>
2022-08-08Also disable line ending conversion for merge workflows (#17953)Joel Challis
2022-06-29Bump actions/checkout from 2 to 3 (#17496)dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-15Ensure dependent CI workflows run (#16662)Joel Challis
2022-03-15Add merge workflow for XAP branch (#16652)Joel Challis
* Add merge workflow for XAP branch * uncomment
2020-11-22identify the qmk-botZach White
2020-11-22Fix failed develop updates within CI (#11001)Joel Challis
* Fix inverted logic * skip locked instead of fail
2020-11-21Rebase develop after a master push (#10812)Zach White
* 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