From 6a45824c88d4714c985eca635ee3bf65212c5dca Mon Sep 17 00:00:00 2001
From: Jan Gleytenhoover <krisellp9@gmail.com>
Date: Fri, 16 Aug 2024 10:23:29 +0000
Subject: [PATCH] Update .gitea/workflows/build.yaml

---
 .gitea/workflows/build.yaml | 145 ++++++++++++++++--------------------
 1 file changed, 66 insertions(+), 79 deletions(-)

diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 9fb2f5c..ca283af 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -1,111 +1,98 @@
-name: Build
-
-on:
+on: 
   push:
     branches:
       - main
 
+name: Build
+
 jobs:
-  build-left:
+  build:
     runs-on: ubuntu-latest
     container:
       image: zmkfirmware/zmk-build-arm:stable
+    name: Build
     steps:
-      - name: Setup
+      - name: Install Dependencies
         run: |
           apt-get update;
-          apt-get install --yes --no-install-recommends nodejs zstd zip
-      - name: Checkout code
+          apt-get install --yes --no-install-recommends \
+            nodejs \
+            zstd \
+            zip                    
+
+      - name: Checkout
         uses: actions/checkout@v4
-      - name: Compute hash for west modules
+
+      - name: Hash west modules
         id: hash-west
         run: |
-          HASH=$(find . -name 'build.yml' -o -name 'west.yml' -exec sha256sum {} \; | sort | sha256sum | head -c 64)
+          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)"
           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-left-${{ steps.hash-west.outputs.hash }}
-      - name: Initialize and update West
-        run: |
-          west init -l config
-          west update
-          west zephyr-export
-      - name: Build Firmware (Left)
+            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: Rename and upload artifact (Left)
-        run: mv build/zephyr/zmk.uf2 cradio_left_nice_nano_v2.uf2
-      - uses: actions/upload-artifact@v3
-        with:
-          path: cradio_left_nice_nano_v2.uf2
-          name: left
 
-  build-right:
-    runs-on: ubuntu-latest
-    container:
-      image: zmkfirmware/zmk-build-arm:stable
-    steps:
-      - name: Setup
+      - 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
         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
+          mkdir firmware
+          mv cradio_left_nice_nano_v2.uf2 firmware/
+          mv cradio_right_nice_nano_v2.uf2 firmware/          
+
+      - name: Hash west modules
         id: hash-west
         run: |
-          HASH=$(find . -name 'build.yml' -o -name 'west.yml' -exec sha256sum {} \; | sort | sha256sum | head -c 64)
+          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)"
           echo "hash=$HASH" >> "$GITHUB_OUTPUT"
-      - 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@v3
-        with:
-          path: cradio_right_nice_nano_v2.uf2
-          name: right
+          echo "computed hash: $HASH"                    
 
-  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@v3
-        with:
-          name: left
-          path: firmware/
-      - uses: actions/download-artifact@v3
-        with:
-          name: right
-          path: firmware/
-      - name: Upload combined firmware artifacts
+      - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:
           path: firmware/