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:
Manna Harbour
2024-02-28 10:23:27 +11:00
parent b5511bacb6
commit 17a6687fdd
5 changed files with 22 additions and 14 deletions

View File

@@ -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"]'

View File

@@ -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"]'

View File

@@ -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"]'

View File

@@ -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"]'