refactor: Move to Zephyr v3.0.0 + ZMK fixes.
This commit is contained in:
parent
df2e993300
commit
94ac100b6b
9 changed files with 9 additions and 14 deletions
|
@ -1,4 +1,4 @@
|
|||
FROM docker.io/zmkfirmware/zmk-dev-arm:2.5
|
||||
FROM docker.io/zmkfirmware/zmk-dev-arm:3.0
|
||||
|
||||
COPY .bashrc tmp
|
||||
RUN mv /tmp/.bashrc ~/.bashrc
|
||||
|
|
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
|
@ -17,7 +17,7 @@ jobs:
|
|||
if: ${{ always() }}
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: docker.io/zmkfirmware/zmk-build-arm:2.5
|
||||
image: docker.io/zmkfirmware/zmk-build-arm:3.0
|
||||
needs: compile-matrix
|
||||
strategy:
|
||||
matrix:
|
||||
|
|
|
@ -29,7 +29,7 @@ jobs:
|
|||
validate-metadata:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: docker.io/zmkfirmware/zmk-dev-arm:2.5
|
||||
image: docker.io/zmkfirmware/zmk-dev-arm:3.0
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Install dependencies
|
||||
|
|
2
.github/workflows/test.yml
vendored
2
.github/workflows/test.yml
vendored
|
@ -16,7 +16,7 @@ jobs:
|
|||
integration_test:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: docker.io/zmkfirmware/zmk-build-arm:2.5
|
||||
image: docker.io/zmkfirmware/zmk-build-arm:3.0
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
#define DT_DRV_COMPAT zmk_behavior_none
|
||||
|
||||
#include <device.h>
|
||||
#include <power/reboot.h>
|
||||
#include <drivers/behavior.h>
|
||||
#include <logging/log.h>
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
#define DT_DRV_COMPAT zmk_behavior_reset
|
||||
|
||||
#include <device.h>
|
||||
#include <power/reboot.h>
|
||||
#include <sys/reboot.h>
|
||||
#include <drivers/behavior.h>
|
||||
#include <logging/log.h>
|
||||
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
#define DT_DRV_COMPAT zmk_behavior_transparent
|
||||
|
||||
#include <device.h>
|
||||
#include <power/reboot.h>
|
||||
#include <drivers/behavior.h>
|
||||
#include <logging/log.h>
|
||||
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
*/
|
||||
|
||||
#include <device.h>
|
||||
#include <power/reboot.h>
|
||||
#include <logging/log.h>
|
||||
|
||||
#include <zmk/split/bluetooth/service.h>
|
||||
|
|
10
app/west.yml
10
app/west.yml
|
@ -4,12 +4,14 @@ manifest:
|
|||
url-base: https://github.com/zephyrproject-rtos
|
||||
- name: zmkfirmware
|
||||
url-base: https://github.com/zmkfirmware
|
||||
- name: petejohanson
|
||||
url-base: https://github.com/petejohanson
|
||||
- name: microsoft
|
||||
url-base: https://github.com/microsoft
|
||||
projects:
|
||||
- name: zephyr
|
||||
remote: zmkfirmware
|
||||
revision: v2.5.0+zmk-fixes
|
||||
remote: petejohanson
|
||||
revision: v3.0.0+zmk-fixes
|
||||
clone-depth: 1
|
||||
import:
|
||||
# TODO: Rename once upstream offers option like `exclude` or `denylist`
|
||||
|
@ -33,9 +35,5 @@ manifest:
|
|||
- openthread
|
||||
- edtt
|
||||
- trusted-firmware-m
|
||||
- name: uf2
|
||||
remote: microsoft
|
||||
path: tools/uf2
|
||||
clone-depth: 1
|
||||
self:
|
||||
west-commands: scripts/west-commands.yml
|
||||
|
|
Loading…
Add table
Reference in a new issue