diff options
| -rw-r--r-- | .github/workflows/build.yml | 4 | ||||
| -rwxr-xr-x | bin/build.sh | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2ef9451..35a2fe9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,11 +36,11 @@ jobs: - name: West Build (left) run: west build -s zmk/app -d build/left -b adv360_left -- -DZMK_CONFIG="${GITHUB_WORKSPACE}/config" - name: Adv360 Left Kconfig file - run: cat build/left/zephyr/.config | grep -v "^#" | grep -v "^$" + run: grep -vE '(^#|^$)' build/left/zephyr/.config - name: West Build (right) run: west build -s zmk/app -d build/right -b adv360_right -- -DZMK_CONFIG="${GITHUB_WORKSPACE}/config" - name: Adv360 Right Kconfig file - run: cat build/right/zephyr/.config | grep -v "^#" | grep -v "^$" + run: grep -vE '(^#|^$)' build/right/zephyr/.config - name: Rename zmk.uf2 run: cp build/left/zephyr/zmk.uf2 left.uf2 && cp build/right/zephyr/zmk.uf2 right.uf2 - name: Archive (Adv360) diff --git a/bin/build.sh b/bin/build.sh index e783844..ade4767 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -8,10 +8,10 @@ TIMESTAMP="${TIMESTAMP:-$(date -u +"%Y%m%d%H%M%S")}" # West Build (left) west build -s zmk/app -d build/left -b adv360_left -- -DZMK_CONFIG="${PWD}/config" # Adv360 Left Kconfig file -cat build/left/zephyr/.config | grep -v "^#" | grep -v "^$" +grep -vE '(^#|^$)' build/left/zephyr/.config # West Build (right) west build -s zmk/app -d build/right -b adv360_right -- -DZMK_CONFIG="${PWD}/config" # Adv360 Right Kconfig file -cat build/right/zephyr/.config | grep -v "^#" | grep -v "^$" +grep -vE '(^#|^$)' build/right/zephyr/.config # Rename zmk.uf2 -cp build/left/zephyr/zmk.uf2 ./firmware/${TIMESTAMP}-left.uf2 && cp build/right/zephyr/zmk.uf2 ./firmware/${TIMESTAMP}-right.uf2 +cp build/left/zephyr/zmk.uf2 "./firmware/${TIMESTAMP}-left.uf2" && cp build/right/zephyr/zmk.uf2 "./firmware/${TIMESTAMP}-right.uf2" |