mirror of
https://github.com/ClaytonWWilson/miryoku_zmk.git
synced 2026-03-10 10:45:04 +00:00
Update branches docs and build examples
- Use branch directly by default
- Attempt automatic merge if desired
- If conflicts
- Build from branch directly
- Request rebase from maintainer
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
# Copyright 2023 Manna Harbour
|
||||
# Copyright 2024 Manna Harbour
|
||||
# https://github.com/manna-harbour/miryoku
|
||||
|
||||
name: 'Build Example mousekeyspr'
|
||||
@@ -11,4 +11,4 @@ jobs:
|
||||
board: '["nice_nano"]'
|
||||
shield: '["corne_left"]'
|
||||
custom_config: '["#define MIRYOKU_KLUDGE_MOUSEKEYSPR"]'
|
||||
branches: '["zmkfirmware/zmk/main caksoylar/zmk/feat/mouse-keys-3.2"]'
|
||||
branches: '["caksoylar/zmk/feat/mouse-keys-3.2","zmkfirmware/zmk/main caksoylar/zmk/feat/mouse-keys-3.2"]'
|
||||
|
||||
2
.github/workflows/build-example-suspend.yml
vendored
2
.github/workflows/build-example-suspend.yml
vendored
@@ -11,4 +11,4 @@ jobs:
|
||||
board: '["nice_nano"]'
|
||||
shield: '["corne_left","corne_right"]'
|
||||
custom_config: '["#define MIRYOKU_KLUDGE_SUSPEND"]'
|
||||
branches: '["zmkfirmware/zmk/main manna-harbour/zmk/suspend-test"]'
|
||||
branches: '["manna-harbour/zmk/suspend-test","zmkfirmware/zmk/main manna-harbour/zmk/suspend-test"]'
|
||||
|
||||
@@ -10,4 +10,4 @@ jobs:
|
||||
with:
|
||||
board: '["native_posix_64"]'
|
||||
custom_config: '["#define MIRYOKU_KLUDGE_TAPDELAY"]'
|
||||
branches: '["zmkfirmware/zmk/main petejohanson/zmk/shell/tap-command"]'
|
||||
branches: '["petejohanson/zmk/shell/tap-command","zmkfirmware/zmk/main petejohanson/zmk/shell/tap-command"]'
|
||||
|
||||
2
.github/workflows/build-example-xmk-xmk.yml
vendored
2
.github/workflows/build-example-xmk-xmk.yml
vendored
@@ -10,4 +10,4 @@ jobs:
|
||||
with:
|
||||
board: '["nice_nano_v2"]'
|
||||
shield: '["xmk"]'
|
||||
branches: '["zmkfirmware/zmk/main petejohanson/zmk/shell/tap-command"]'
|
||||
branches: '["petejohanson/zmk/shell/tap-command","zmkfirmware/zmk/main petejohanson/zmk/shell/tap-command"]'
|
||||
|
||||
Reference in New Issue
Block a user