From 1d650a815276fbbe53928a3d52fdaa93e9eefda2 Mon Sep 17 00:00:00 2001
From: Markus Tacker <Markus.Tacker@NordicSemi.no>
Date: Fri, 9 Dec 2022 13:42:30 +0100
Subject: [PATCH] feat: enable WiFi debug build (#8)

P-GPS must be disabled for that.
---
 .github/workflows/build-and-release.yaml | 25 +++++++++++++++++++-----
 package.json                             | 20 +++++++++++++++++++
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml
index ef4a550..c550d48 100644
--- a/.github/workflows/build-and-release.yaml
+++ b/.github/workflows/build-and-release.yaml
@@ -62,9 +62,10 @@ jobs:
           # There is not Solar shield for the nRF9160DK
           - thingy91+low-power+solar+memfault
           - thingy91+debug+solar+memfault
-          # When enabling WiFi, neither debug nor Memfault fit flash
+          # When enabling WiFi, Memfault does not fit flash
           # There is no WiFi shield for the Thingy:91
           - nrf9160dk+low-power+wifi
+          - nrf9160dk+debug+wifi
 
     steps:
       - uses: actions/checkout@v3
@@ -108,11 +109,11 @@ jobs:
         working-directory: firmware
 
       - name: enable low-power build
-        if: matrix.configuration == 'low-power'
+        if: contains(matrix.configuration, 'low-power')
         run: echo CONFIG_OVERLAY=overlay-low-power.conf >> $GITHUB_ENV
 
       - name: enable debug build
-        if: matrix.configuration == 'debug'
+        if: contains(matrix.configuration, 'debug')
         run: echo CONFIG_OVERLAY=overlay-debug.conf >> $GITHUB_ENV
 
       - name: enable solar shield support
@@ -125,6 +126,11 @@ jobs:
           echo SHIELD_OVERLAY=overlay-nrf7002ek-wifi-scan-only.conf >> $GITHUB_ENV
           echo EXTRA_ARGS="-DSHIELD=nrf7002_ek -DDTC_OVERLAY_FILE=nrf9160dk_with_nrf7002ek.overlay" >> $GITHUB_ENV
 
+      # WiFi cannot be combined with P-GPS support
+      - name: enable P-GPS
+        if: ${{ !contains(matrix.configuration, 'wifi') }}
+        run: echo PGPS_OVERLAY=overlay-pgps.conf >> $GITHUB_ENV
+
       - name: Build
         working-directory: firmware
         run: |
@@ -139,9 +145,18 @@ jobs:
               --build-dir /workdir/project/build \
               -- \
                 ${{ env.EXTRA_ARGS }} \
-                -DOVERLAY_CONFIG="${{ env.CONFIG_OVERLAY }};overlay-pgps.conf;overlay-aws.conf;${{ env.MEMFAULT_OVERLAY }};/workdir/project/thingy_world.conf;/workdir/project/firmware.conf;${{ env.SHIELD_OVERLAY }}" \
+                -DOVERLAY_CONFIG="${{ env.CONFIG_OVERLAY }};${{ env.PGPS_OVERLAY }};overlay-aws.conf;${{ env.MEMFAULT_OVERLAY }};/workdir/project/thingy_world.conf;/workdir/project/firmware.conf;${{ env.SHIELD_OVERLAY }}" \
                 -DEXTRA_CFLAGS="-Werror"
 
+      - run: cat firmware/firmware.conf
+        if: failure()
+
+      - run: cat firmware/build/zephyr/.config
+        if: failure()
+
+      - run: cat firmware/build/zephyr/zephyr.dts
+        if: failure()
+
       - name: Upload symbols file to Memfault
         if: contains(matrix.configuration, 'memfault')
         working-directory: firmware
@@ -162,9 +177,9 @@ jobs:
           cp firmware/build/zephyr/app_signed.hex ./
           cp firmware/build/zephyr/app_update.bin ./
           cp firmware/build/zephyr/zephyr.elf ./
-          cp firmware/firmware.conf ./
 
       - uses: actions/upload-artifact@v3
+        if: always()
         with:
           name: ${{ matrix.configuration }}-${{
             needs.date-string.outputs.dateAsString }}-${{ github.sha }}
diff --git a/package.json b/package.json
index c896d69..b01efc3 100644
--- a/package.json
+++ b/package.json
@@ -185,6 +185,26 @@
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/nrf9160dk+low-power+wifi-*/zephyr.elf",
               "name": "thingy_world-nRF9160DK-low-power+wifi-${nextRelease.gitTag}.elf",
               "label": "Symbol file for nRF9160 DK with WiFi Shield firmware (low power)"
+            },
+            {
+              "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/nrf9160dk+debug+wifi-*/merged.hex",
+              "name": "thingy_world-nRF9160DK-debug+wifi-${nextRelease.gitTag}.hex",
+              "label": "Pre-build HEX file for nRF9160 DK with WiFi Shield (debug)"
+            },
+            {
+              "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/nrf9160dk+debug+wifi-*/app_signed.hex",
+              "name": "thingy_world-nRF9160DK-debug+wifi-${nextRelease.gitTag}-signed.hex",
+              "label": "Pre-build HEX file for nRF9160 DK with WiFi Shield (debug, signed)"
+            },
+            {
+              "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/nrf9160dk+debug+wifi-*/app_update.bin",
+              "name": "thingy_world-nRF9160DK-debug+wifi-${nextRelease.gitTag}-app_upgrade.bin",
+              "label": "App upgrade file for nRF9160 DK with WiFi Shield (debug)"
+            },
+            {
+              "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/nrf9160dk+debug+wifi-*/zephyr.elf",
+              "name": "thingy_world-nRF9160DK-debug+wifi-${nextRelease.gitTag}.elf",
+              "label": "Symbol file for nRF9160 DK with WiFi Shield firmware (debug)"
             }
           ]
         }