fix: update from upstream

This removes the need to define FOTA version

Author: coderbyheart

.github/workflows/build-and-release.yaml

@@ -99,7 +99,6 @@ jobs:
         run: |
           APP_VERSION=${{ steps.version.outputs.nextRelease }}-${{ matrix.board }}-${{ matrix.network }}-${{ matrix.loglevel }}
           echo "CONFIG_ASSET_TRACKER_V2_APP_VERSION=\"${APP_VERSION}\"" >> prj.conf
-          echo "CONFIG_AZURE_FOTA_APP_VERSION=\"${APP_VERSION}\"" >> prj.conf
 
       - name: Enable debug logs
         if: matrix.loglevel == 'debug'
@@ -210,7 +209,6 @@ jobs:
           APP_VERSION=${{ github.sha }}-${{ matrix.board }}-${{ matrix.network }}-${JOB_ID}
           echo "APP_VERSION=${APP_VERSION}" >> $GITHUB_ENV
           echo "CONFIG_ASSET_TRACKER_V2_APP_VERSION=\"${APP_VERSION}-original\"" >> prj.conf
-          echo "CONFIG_AZURE_FOTA_APP_VERSION=\"${APP_VERSION}-original\"" >> prj.conf
 
       - run: echo "# Firmware CI settings" >> prj.conf
 
@@ -259,7 +257,6 @@ jobs:
       - name: Build with changed version for FOTA test
         run: |
           echo "CONFIG_ASSET_TRACKER_V2_APP_VERSION=\"${APP_VERSION}-upgraded\"" >> prj.conf
-          echo "CONFIG_AZURE_FOTA_APP_VERSION=\"${APP_VERSION}-upgraded\"" >> prj.conf
           docker run --rm -v ${PWD}:/workdir/ncs/firmware ${{ needs.docker.outputs.docker_image }} /bin/bash -c 'cd ncs/firmware && west update && west build -p always -b ${{ matrix.board }} -- -DOVERLAY_CONFIG="overlay-debug.conf;asset-tracker-cloud-firmware-azure.conf"'
           cp build/zephyr/app_update.bin fota-upgrade.bin
           cp prj.conf fota-upgrade.conf

Kconfig

@@ -8,9 +8,20 @@ menu "Asset Tracker"
 
 config ASSET_TRACKER_V2_APP_VERSION
 	string "Asset Tracker application firmware version"
-	default AZURE_FOTA_APP_VERSION if AZURE_IOT_HUB && AZURE_FOTA && !AZURE_FOTA_APP_VERSION_AUTO
 	default "0.0.0-development"
 
+config AZURE_FOTA_APP_VERSION
+	default ASSET_TRACKER_V2_APP_VERSION if AZURE_IOT_HUB && AZURE_FOTA && !AZURE_FOTA_APP_VERSION_AUTO
+	help
+	  Kconfig redefinition that aligns the azure fota and application version strings.
+	  When updating the application firmware the ASSET_TRACKER_V2_APP_VERSION option should be
+	  used as it takes precedence over the AZURE_FOTA_APP_VERSION option.
+
+config AZURE_FOTA_VERSION_MAX_LEN
+	default ASSET_TRACKER_V2_APP_VERSION_MAX_LEN if AZURE_IOT_HUB && AZURE_FOTA && !AZURE_FOTA_APP_VERSION_AUTO
+	help
+	  Kconfig redefinition that aligns the azure fota and application version string length.
+
 config ASSET_TRACKER_V2_APP_VERSION_MAX_LEN
 	int "Maximum length of application firmware version"
 	default 150