Compare commits

...

38 Commits

Author SHA1 Message Date
27aa448c1c tidy up for main
Some checks are pending
Build
Build / Build (push) Has started running
2023-04-11 20:26:28 +00:00
6ad09f6aab don't upload artifacts for now
All checks were successful
Build
2023-04-11 19:04:48 +00:00
69dea59871 try to upload as release instead
Some checks failed
Build
2023-04-10 21:43:16 +00:00
a21137dcab Revert "undo these things for curiosity"
Some checks failed
Build
This reverts commit 84c7f2a043.
2023-04-10 21:28:09 +00:00
84c7f2a043 undo these things for curiosity
Some checks failed
Build
2023-04-10 21:27:41 +00:00
93aad50f66 Revert "back to upload-artifact@v2"
Some checks failed
Build
This reverts commit 8bfa9fcc48.
2023-04-10 21:18:31 +00:00
8bfa9fcc48 back to upload-artifact@v2
Some checks failed
Build
2023-04-10 21:00:57 +00:00
154662d4cf add ACTIONS_RUNTIME_TOKEN env variable
Some checks failed
Build
2023-04-10 20:15:37 +00:00
d54600c8aa back to cache@v2
Some checks failed
Build
2023-04-10 19:51:26 +00:00
999156146b don't specify ssh creds
Some checks failed
Build
2023-04-10 19:47:29 +00:00
aea0303fb4 back to apt
Some checks are pending
Build
2023-04-10 19:46:11 +00:00
a83640484d try some formatting
Some checks are pending
Build
2023-04-09 20:19:11 +00:00
f552350c06 use apt-get for better output
Some checks are pending
Build
2023-04-09 20:11:43 +00:00
ce26164afb make it safe again
Some checks are pending
Build
2023-04-09 20:10:20 +00:00
eb1d8f38db change ssh access key after this
Some checks failed
Build
2023-04-09 20:04:22 +00:00
95d64d84a8 undo last commit
Some checks are pending
Build
2023-04-09 19:59:07 +00:00
af08714610 back to the roots; try githubs env
Some checks are pending
Build
2023-04-09 19:51:27 +00:00
71cd8ca6ed add ssh-known-hosts for strict host checking
Some checks failed
Build
2023-04-09 19:46:17 +00:00
42205882d7 install ssh too
Some checks failed
Build
2023-04-09 19:39:47 +00:00
c5a27a04ad apt update before installing
Some checks failed
Build
2023-04-09 19:37:32 +00:00
8ee0b58f15 wtf, install node before installing node?
Some checks failed
Build
2023-04-09 19:35:47 +00:00
6e2af44df2 setup node first
Some checks failed
Build
2023-04-09 19:31:40 +00:00
7ea66fa5c4 even more explicit URLs
Some checks failed
Build
2023-04-09 19:30:02 +00:00
09162c7e91 add node setup action
Some checks failed
Build
2023-04-09 19:28:43 +00:00
fa4c9ad355 [FIX!] more explicit repository URLs
Some checks failed
Build
2023-04-09 19:09:56 +00:00
762f3c1feb [FIX?] explicitly use github actions repo
All checks were successful
Build
2023-04-09 19:08:01 +00:00
1f35f407aa [FIX?] use @v3 actions
All checks were successful
Build
2023-04-09 19:05:41 +00:00
360b3e111f [FIX] pass ssh-key to cache too
All checks were successful
Build
2023-04-09 19:01:22 +00:00
0002b86f4b [FIX?]
All checks were successful
Build
2023-04-09 18:55:19 +00:00
e3a231b240 more gitea actions testing
All checks were successful
Build
2023-04-09 18:53:56 +00:00
ce7114cb52 try action version from gitea repository
All checks were successful
Build
2023-04-09 18:37:12 +00:00
85f70974f9 enable usb logging
All checks were successful
Build
2023-04-09 14:11:54 +00:00
664b4b61db [FIX] use correct shorthand modifier code 2023-04-09 13:50:54 +00:00
7f25cebef8 shorter sticky layer 2023-04-09 13:42:06 +00:00
de09bf6581 back to github for building
All checks were successful
Build
2023-04-09 13:37:31 +00:00
172b4c8516 try another token
All checks were successful
Build
2023-04-09 13:32:34 +00:00
7db1a8fc48 use token for auth
All checks were successful
Build
2023-04-09 13:31:10 +00:00
3d33228247 add ctrl+alt modifier
All checks were successful
Build
2023-04-09 12:33:13 +00:00
3 changed files with 36 additions and 20 deletions

View File

@ -9,10 +9,14 @@ jobs:
image: zmkfirmware/zmk-build-arm:stable image: zmkfirmware/zmk-build-arm:stable
name: Build name: Build
steps: steps:
- name: Install Dependencies
run: apt update; apt install -y nodejs ssh
- name: Setup Node
uses: actions/setup-node@v3
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: Cache west modules - name: Cache west modules
uses: actions/cache@v2 uses: https://github.com/actions/cache@v2
env: env:
cache-name: cache-zephyr-modules cache-name: cache-zephyr-modules
with: with:
@ -33,26 +37,36 @@ jobs:
run: west update run: west update
- name: West Zephyr export - name: West Zephyr export
run: west zephyr-export run: west zephyr-export
- name: West Build (Corne Left) - name: West Build (Corne Left)
run: west build -s zmk/app -b nice_nano_v2 -- -DSHIELD=corne_left -DZMK_CONFIG="${GITHUB_WORKSPACE}/config" run: west build -s zmk/app -b nice_nano_v2 -- -DSHIELD=corne_left -DZMK_CONFIG="${GITHUB_WORKSPACE}/config"
- name: Corne Left Kconfig file - name: Corne Left Kconfig file
run: cat build/zephyr/.config | grep -v "^#" | grep -v "^$" run: cat build/zephyr/.config | grep -v "^#" | grep -v "^$"
- name: Rename zmk.uf2 # - name: Rename zmk.uf2
run: cp build/zephyr/zmk.uf2 corne_left_nice_nano_v2.uf2 # run: cp build/zephyr/zmk.uf2 corne_left_nice_nano_v2.uf2
- name: Archive (Corne Left) # - name: Archive (Corne Left)
uses: actions/upload-artifact@v2 # uses: https://github.com/actions/upload-artifact@v3
with: # with:
name: firmware # name: firmware
path: corne_left_nice_nano_v2.uf2 # path: corne_left_nice_nano_v2.uf2
- name: West Build (Corne Right) - name: West Build (Corne Right)
run: west build --pristine -s zmk/app -b nice_nano_v2 -- -DSHIELD=corne_right -DZMK_CONFIG="${GITHUB_WORKSPACE}/config" run: west build --pristine -s zmk/app -b nice_nano_v2 -- -DSHIELD=corne_right -DZMK_CONFIG="${GITHUB_WORKSPACE}/config"
- name: Corne Right Kconfig file - name: Corne Right Kconfig file
run: cat build/zephyr/.config | grep -v "^#" | grep -v "^$" run: cat build/zephyr/.config | grep -v "^#" | grep -v "^$"
- name: Rename zmk.uf2 # - name: Rename zmk.uf2
run: cp build/zephyr/zmk.uf2 corne_right_nice_nano_v2.uf2 # run: cp build/zephyr/zmk.uf2 corne_right_nice_nano_v2.uf2
- name: Archive (Corne Right) # - name: Archive (Corne Right)
uses: actions/upload-artifact@v2 # uses: https://github.com/actions/upload-artifact@v3
with: # with:
name: firmware # name: firmware
path: corne_right_nice_nano_v2.uf2 # path: corne_right_nice_nano_v2.uf2
# - name: Release
# - name: Upload artifacts as release
# uses: https://github.com/softprops/action-gh-release@v1
# if: startsWith(github.ref, 'refs/tags/')
# with:
# files: |
# corne_left_nice_nano_v2.uf2
# corne_right_nice_nano_v2.uf2

View File

@ -10,3 +10,5 @@ CONFIG_ZMK_SLEEP=y
CONFIG_ZMK_IDLE_TIMEOUT=30000 CONFIG_ZMK_IDLE_TIMEOUT=30000
# Sleep timeout to 15 minutes # Sleep timeout to 15 minutes
CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=900000 CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=900000
CONFIG_ZMK_USB_LOGGING=y

View File

@ -10,7 +10,7 @@
#include <dt-bindings/zmk/outputs.h> #include <dt-bindings/zmk/outputs.h>
&sl { &sl {
release-after-ms = <2000>; release-after-ms = <1000>;
}; };
&sk { &sk {
@ -26,7 +26,7 @@
&kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT &kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT
&sk CAPS &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT &sk CAPS &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT
&sk LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &mo 1 &sk LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &mo 1
&kp LGUI &sk LCTRL &kp SPACE &kp LC(BSPC) &sl 2 &sk LALT &kp LGUI &sk LCTRL &kp SPACE &kp LC(LALT) &sl 2 &sk LALT
>; >;
}; };