Compare commits

..

1 Commits

Author SHA1 Message Date
088abb50ae Update GitHub Artifact Actions to v4 2024-08-16 10:03:25 +00:00
2 changed files with 83 additions and 70 deletions

@ -1,98 +1,111 @@
on:
name: Build
on:
push:
branches:
- main
name: Build
jobs:
build:
build-left:
runs-on: ubuntu-latest
container:
image: zmkfirmware/zmk-build-arm:stable
name: Build
steps:
- name: Install Dependencies
- name: Setup
run: |
apt-get update;
apt-get install --yes --no-install-recommends \
nodejs \
zstd \
zip
- name: Checkout
apt-get install --yes --no-install-recommends nodejs zstd zip
- name: Checkout code
uses: actions/checkout@v4
- name: Hash west modules
- name: Compute hash for west modules
id: hash-west
run: |
FILE_PATH=zephyr/west.yml
FILES=$(find . -name build.yml -o -name west.yml -type f -exec sha256sum \; | sort)
HASH="$(echo -n $FILES | sha256sum | head -c 64)"
HASH=$(find . -name 'build.yml' -o -name 'west.yml' -exec sha256sum {} \; | sort | sha256sum | head -c 64)
echo "hash=$HASH" >> "$GITHUB_OUTPUT"
echo "computed hash: $HASH"
- name: Cache west modules
uses: actions/cache@v4
env:
cache-name: cache-zephyr-modules
with:
path: |
modules/
tools/
zephyr/
bootloader/
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ steps.hash-west.outputs.hash }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
timeout-minutes: 5
continue-on-error: true
- name: West Init
run: west init -l config
- name: West Update
run: west update
- name: West Zephyr export
run: west zephyr-export
- name: West Build (Ferris Left)
run: west build -s zmk/app -b nice_nano_v2 -- -DSHIELD=cradio_left -DZMK_CONFIG="${GITHUB_WORKSPACE}/config"
- name: Ferris Left Kconfig file
run: cat build/zephyr/.config | grep -v "^#" | grep -v "^$"
- name: Rename zmk.uf2
run: cp build/zephyr/zmk.uf2 cradio_left_nice_nano_v2.uf2
- name: West Build (Ferris Right)
run: west build --pristine -s zmk/app -b nice_nano_v2 -- -DSHIELD=cradio_right -DZMK_CONFIG="${GITHUB_WORKSPACE}/config"
- name: Ferris Right Kconfig file
run: cat build/zephyr/.config | grep -v "^#" | grep -v "^$"
- name: Rename zmk.uf2
run: cp build/zephyr/zmk.uf2 cradio_right_nice_nano_v2.uf2
- name: Move artifacts
bootloader/
key: ${{ runner.os }}-build-left-${{ steps.hash-west.outputs.hash }}
- name: Initialize and update West
run: |
mkdir firmware
mv cradio_left_nice_nano_v2.uf2 firmware/
mv cradio_right_nice_nano_v2.uf2 firmware/
west init -l config
west update
west zephyr-export
- name: Build Firmware (Left)
run: west build -s zmk/app -b nice_nano_v2 -- -DSHIELD=cradio_left -DZMK_CONFIG="${GITHUB_WORKSPACE}/config"
- name: Rename and upload artifact (Left)
run: mv build/zephyr/zmk.uf2 cradio_left_nice_nano_v2.uf2
- uses: actions/upload-artifact@v4
with:
path: cradio_left_nice_nano_v2.uf2
name: left
- name: Hash west modules
build-right:
runs-on: ubuntu-latest
container:
image: zmkfirmware/zmk-build-arm:stable
steps:
- name: Setup
run: |
apt-get update;
apt-get install --yes --no-install-recommends nodejs zstd zip
- name: Checkout code
uses: actions/checkout@v4
- name: Compute hash for west modules
id: hash-west
run: |
FILE_PATH=zephyr/west.yml
FILES=$(find . -name build.yml -o -name west.yml -type f -exec sha256sum \; | sort)
HASH="$(echo -n $FILES | sha256sum | head -c 64)"
HASH=$(find . -name 'build.yml' -o -name 'west.yml' -exec sha256sum {} \; | sort | sha256sum | head -c 64)
echo "hash=$HASH" >> "$GITHUB_OUTPUT"
echo "computed hash: $HASH"
- name: Cache west modules
uses: actions/cache@v4
with:
path: |
modules/
tools/
zephyr/
bootloader/
key: ${{ runner.os }}-build-right-${{ steps.hash-west.outputs.hash }}
- name: Initialize and update West
run: |
west init -l config
west update
west zephyr-export
- name: Build Firmware (Right)
run: west build --pristine -s zmk/app -b nice_nano_v2 -- -DSHIELD=cradio_right -DZMK_CONFIG="${GITHUB_WORKSPACE}/config"
- name: Rename and upload artifact (Right)
run: mv build/zephyr/zmk.uf2 cradio_right_nice_nano_v2.uf2
- uses: actions/upload-artifact@v4
with:
path: cradio_right_nice_nano_v2.uf2
name: right
- name: Upload Artifact
combine:
needs:
- build-left
- build-right
runs-on: ubuntu-latest
container:
image: zmkfirmware/zmk-build-arm:stable
steps:
- name: Setup
run: |
apt-get update;
apt-get install --yes --no-install-recommends nodejs zip
- name: Download artifacts
uses: actions/download-artifact@v4
with:
name: left
path: firmware/
- uses: actions/download-artifact@v4
with:
name: right
path: firmware/
- name: Upload combined firmware artifacts
uses: actions/upload-artifact@v4
with:
path: firmware/

@ -11,7 +11,7 @@
&lt {
tapping-term-ms = <200>;
quick-tap-ms = <200>;
quick-tap-ms = <150>;
flavor = "tap-preferred";
#binding-cells = <2>;
};
@ -50,13 +50,13 @@
#binding-cells = <2>;
flavor = "tap-preferred";
tapping-term-ms = <200>;
quick-tap-ms = <200>;
quick-tap-ms = <150>;
require-prior-idle-ms = <100>;
bindings = <&kp>, <&kp>;
};
lt: layer_tap {
tapping-term-ms = <200>;
quick-tap-ms = <200>;
quick-tap-ms = <150>;
flavor = "tap-preferred";
#binding-cells = <2>;
};