Daniel Schaefer
50eff5af7d
Merge branch 'master' into lotus
2023-02-01 17:42:57 +08:00
Nick Brassel
f75ac6042e
Lock down workflow permissions. ( #19406 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
2022-12-23 10:41:16 +11:00
Daniel Schaefer
98ebc096ad
Disable gh actions workflows that won't work on our fork
...
And don't make sense.
Signed-off-by: Daniel Schaefer <dhs@frame.work>
2022-12-16 11:35:04 +08:00
Joel Challis
0002b1cc20
Also disable line ending conversion for merge workflows ( #17953 )
2022-08-08 19:05:41 +01:00
dependabot[bot]
58f4e19503
Bump actions/checkout from 2 to 3 ( #17496 )
...
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-29 16:44:54 +10:00
Joel Challis
8bffc61959
Ensure dependent CI workflows run ( #16662 )
2022-03-15 23:27:55 +00:00
Joel Challis
46e85ded47
Add merge workflow for XAP branch ( #16652 )
...
* Add merge workflow for XAP branch
* uncomment
2022-03-15 12:49:23 +00:00
Zach White
c731628946
identify the qmk-bot
2020-11-22 08:07:45 -08:00
Joel Challis
ca9edc5fe3
Fix failed develop updates within CI ( #11001 )
...
* Fix inverted logic
* skip locked instead of fail
2020-11-22 07:50:14 -08:00
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
2020-11-21 11:48:13 -08:00
