Compare commits

..

No commits in common. "c7e21c54b7f4f5e64436e8e4d25d41f624bef7bd" and "ef20c44a71f9d61a6b255adddd0920d24e1bad38" have entirely different histories.

View File

@ -27,13 +27,13 @@ jobs:
ln -s /usr/src/zephyr-3.4.0/zephyr zephyr ln -s /usr/src/zephyr-3.4.0/zephyr zephyr
ln -s /usr/src/zephyr-3.4.0/bootloader bootloader ln -s /usr/src/zephyr-3.4.0/bootloader bootloader
- name: Hash west modules - name: Hash west module
id: hash-west id: hash-west
run: | run: |
FILE_PATH=zephyr/west.yml FILE_PATH=zephyr/west.yml
HASH=$(sha256sum <(find . -name build.yml -o -name west.yml -type f -exec sha256sum \; | sort) | head -c 64) HASH=$(sha256sum $FILE_PATH | head -c 64)
echo "hash=$HASH" >> "$GITHUB_OUTPUT" echo "hash=$HASH" >> "$GITHUB_OUTPUT"
echo "computed hash: $HASH" echo "computed hash: $HASH $FILE_PATH"
- name: Cache west modules - name: Cache west modules
uses: actions/cache@v3 uses: actions/cache@v3
@ -45,7 +45,6 @@ jobs:
tools/ tools/
zephyr/ zephyr/
bootloader/ bootloader/
zmk/
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ steps.hash-west.outputs.hash }} key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ steps.hash-west.outputs.hash }}
restore-keys: | restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}- ${{ runner.os }}-build-${{ env.cache-name }}-
@ -61,7 +60,7 @@ jobs:
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 zephyr -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 "^$"
@ -70,7 +69,7 @@ jobs:
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: 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 zephyr -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 "^$"
@ -87,10 +86,9 @@ jobs:
path: firmware.zip path: firmware.zip
name: firmware.zip name: firmware.zip
- name: Hash west modules - name: Hash west module
id: hash-west id: hash-west
run: | run: |
FILE_PATH=zephyr/west.yml HASH=$(sha256sum zephyr/west.yml | head -c 64)
HASH=$(sha256sum <(find . -name build.yml -o -name west.yml -type f -exec sha256sum \; | sort) | head -c 64)
echo "hash=$HASH" >> "$GITHUB_OUTPUT" echo "hash=$HASH" >> "$GITHUB_OUTPUT"
echo "computed hash: $HASH" echo "computed hash: $HASH"