[#34] Include merged.hex into release build for sub-components (b0, mcuboot, fwloader) (#37)

Author: TheSomeMan

.github/workflows/build-fw_nrf52840dk_a2_release_mock.yml

@@ -293,18 +293,21 @@ jobs:
           if [ "${flag_build_release_subcomponent}" = true ]; then
             if [ "${flag_build_release_b0}" = true ]; then
               paths=(
+                "merged.hex"
                 "b0_container.hex"
                 "app_provision.hex"
               )
             elif [ "${flag_build_release_mcuboot}" = true ]; then
               paths=(
+                "merged.hex"
                 "signed_by_mcuboot_and_b0_mcuboot.bin"
                 "signed_by_mcuboot_and_b0_mcuboot.hex"
                 "signed_by_mcuboot_and_b0_s1_image.bin"
                 "signed_by_mcuboot_and_b0_s1_image.hex"
               )
             elif [ "${flag_build_release_fwloader}" = true ]; then
               paths=(
+                "merged.hex"
                 "firmware_loader/zephyr/ruuvi_air_fw_loader.signed.bin"
                 "firmware_loader/zephyr/ruuvi_air_fw_loader.signed.hex"
               )

.github/workflows/build-fw_ruuviair_a1-dev.yml

@@ -295,18 +295,21 @@ jobs:
           if [ "${flag_build_release_subcomponent}" = true ]; then
             if [ "${flag_build_release_b0}" = true ]; then
               paths=(
+                "merged.hex"
                 "b0_container.hex"
                 "app_provision.hex"
               )
             elif [ "${flag_build_release_mcuboot}" = true ]; then
               paths=(
+                "merged.hex"
                 "signed_by_mcuboot_and_b0_mcuboot.bin"
                 "signed_by_mcuboot_and_b0_mcuboot.hex"
                 "signed_by_mcuboot_and_b0_s1_image.bin"
                 "signed_by_mcuboot_and_b0_s1_image.hex"
               )
             elif [ "${flag_build_release_fwloader}" = true ]; then
               paths=(
+                "merged.hex"
                 "firmware_loader/zephyr/ruuvi_air_fw_loader.signed.bin"
                 "firmware_loader/zephyr/ruuvi_air_fw_loader.signed.hex"
               )

.github/workflows/build-fw_ruuviair_a2-dev.yml

@@ -295,18 +295,21 @@ jobs:
           if [ "${flag_build_release_subcomponent}" = true ]; then
             if [ "${flag_build_release_b0}" = true ]; then
               paths=(
+                "merged.hex"
                 "b0_container.hex"
                 "app_provision.hex"
               )
             elif [ "${flag_build_release_mcuboot}" = true ]; then
               paths=(
+                "merged.hex"
                 "signed_by_mcuboot_and_b0_mcuboot.bin"
                 "signed_by_mcuboot_and_b0_mcuboot.hex"
                 "signed_by_mcuboot_and_b0_s1_image.bin"
                 "signed_by_mcuboot_and_b0_s1_image.hex"
               )
             elif [ "${flag_build_release_fwloader}" = true ]; then
               paths=(
+                "merged.hex"
                 "firmware_loader/zephyr/ruuvi_air_fw_loader.signed.bin"
                 "firmware_loader/zephyr/ruuvi_air_fw_loader.signed.hex"
               )

.github/workflows/build-fw_ruuviair_a2-prod.yml

@@ -292,18 +292,21 @@ jobs:
           if [ "${flag_build_release_subcomponent}" = true ]; then
             if [ "${flag_build_release_b0}" = true ]; then
               paths=(
+                "merged.hex"
                 "b0_container.hex"
                 "app_provision.hex"
               )
             elif [ "${flag_build_release_mcuboot}" = true ]; then
               paths=(
+                "merged.hex"
                 "signed_by_mcuboot_and_b0_mcuboot.bin"
                 "signed_by_mcuboot_and_b0_mcuboot.hex"
                 "signed_by_mcuboot_and_b0_s1_image.bin"
                 "signed_by_mcuboot_and_b0_s1_image.hex"
               )
             elif [ "${flag_build_release_fwloader}" = true ]; then
               paths=(
+                "merged.hex"
                 "firmware_loader/zephyr/ruuvi_air_fw_loader.signed.bin"
                 "firmware_loader/zephyr/ruuvi_air_fw_loader.signed.hex"
               )

.github/workflows/build-fw_ruuviair_a3-dev.yml

@@ -295,18 +295,21 @@ jobs:
           if [ "${flag_build_release_subcomponent}" = true ]; then
             if [ "${flag_build_release_b0}" = true ]; then
               paths=(
+                "merged.hex"
                 "b0_container.hex"
                 "app_provision.hex"
               )
             elif [ "${flag_build_release_mcuboot}" = true ]; then
               paths=(
+                "merged.hex"
                 "signed_by_mcuboot_and_b0_mcuboot.bin"
                 "signed_by_mcuboot_and_b0_mcuboot.hex"
                 "signed_by_mcuboot_and_b0_s1_image.bin"
                 "signed_by_mcuboot_and_b0_s1_image.hex"
               )
             elif [ "${flag_build_release_fwloader}" = true ]; then
               paths=(
+                "merged.hex"
                 "firmware_loader/zephyr/ruuvi_air_fw_loader.signed.bin"
                 "firmware_loader/zephyr/ruuvi_air_fw_loader.signed.hex"
               )

.github/workflows/build-fw_ruuviair_a3-prod.yml

@@ -292,18 +292,21 @@ jobs:
           if [ "${flag_build_release_subcomponent}" = true ]; then
             if [ "${flag_build_release_b0}" = true ]; then
               paths=(
+                "merged.hex"
                 "b0_container.hex"
                 "app_provision.hex"
               )
             elif [ "${flag_build_release_mcuboot}" = true ]; then
               paths=(
+                "merged.hex"
                 "signed_by_mcuboot_and_b0_mcuboot.bin"
                 "signed_by_mcuboot_and_b0_mcuboot.hex"
                 "signed_by_mcuboot_and_b0_s1_image.bin"
                 "signed_by_mcuboot_and_b0_s1_image.hex"
               )
             elif [ "${flag_build_release_fwloader}" = true ]; then
               paths=(
+                "merged.hex"
                 "firmware_loader/zephyr/ruuvi_air_fw_loader.signed.bin"
                 "firmware_loader/zephyr/ruuvi_air_fw_loader.signed.hex"
               )