Skip to content

Commit

Permalink
Build: Patch OLED ext-pwr bug
Browse files Browse the repository at this point in the history
This commit adjusts the github build action to apply the zephyr patch from this PR:
zmkfirmware/zmk#674 (comment)

It can then be used with a zmk fork that patches zmk’s external power code:
infused-kim/zmk@ec0a365
  • Loading branch information
infused-kim committed Mar 20, 2022
1 parent 4187839 commit 2617a75
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
build:
runs-on: ubuntu-latest
container:
image: zmkfirmware/zmk-build-arm:2.5
image: zmkfirmware/zmk-dev-arm:2.5
needs: matrix
name: Build
strategy:
Expand Down Expand Up @@ -68,6 +68,11 @@ jobs:
run: west update
- name: West Zephyr export
run: west zephyr-export
- name: Patch Zephyr OLED
working-directory: ./zephyr
run: |
wget https://github.com/zmkfirmware/zmk/files/8009722/zephyr_oled_i2c_fix_full_init.diff.txt
git apply zephyr_oled_i2c_fix_full_init.diff.txt
- name: West Build (${{ steps.variables.outputs.display-name }})
run: |
west build -s zmk/app -b ${{ matrix.board }} -- -DZMK_CONFIG=${GITHUB_WORKSPACE}/config ${{ steps.variables.outputs.extra-cmake-args }} ${{ matrix.cmake-args }}
Expand Down
4 changes: 2 additions & 2 deletions config/west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ manifest:
# revision: main
# import: app/west.yml
- name: zmk
remote: zmkfirmware
revision: main
remote: zmkfirmware-infused-kim
revision: my-changes/oled-ext-pwr
import: app/west.yml
self:
path: config

0 comments on commit 2617a75

Please sign in to comment.