Final Version before merge

Author: cnadler86

.github/workflows/ESP32.yml

@@ -132,24 +132,27 @@ jobs:
           source ~/esp-idf/export.sh
 
           # Check if a variant is defined and adjust the make command
-          IFS='@' read -r BUILD_DIR CAMERA_MODEL <<< "${{ matrix.board }}"
-          IFS='-' read -r BOARD_NAME BOARD_VARIANT <<< "${BUILD_DIR}"
+          IFS='@' read -r BUILD_TARGET CAMERA_MODEL <<< "${{ matrix.board }}"
+          IFS='-' read -r BOARD_NAME BOARD_VARIANT <<< "${BUILD_TARGET}"
           
           if [ -n "${BOARD_VARIANT}" ]; then
             MAKE_CMD="USER_C_MODULES=${{ github.workspace }}/src/micropython.cmake BOARD=$BOARD_NAME BOARD_VARIANT=$BOARD_VARIANT"
           else
             MAKE_CMD="USER_C_MODULES=${{ github.workspace }}/src/micropython.cmake BOARD=$BOARD_NAME"
           fi
           if [ -n "${CAMERA_MODEL}" ]; then
+            echo "FW_NAME=${CAMERA_MODEL}" >> $GITHUB_ENV
             make ${MAKE_CMD} CFLAGS_EXTRA="-DMP_CAMERA_MODEL_${CAMERA_MODEL}=1" all
           else
+            echo "FW_NAME=${BUILD_TARGET}" >> $GITHUB_ENV
             make ${MAKE_CMD} all
           fi
-          mv ~/micropython/ports/esp32/build-${BUILD_DIR}/firmware.bin ~/${{ matrix.board }}.bin
+          mv ~/micropython/ports/esp32/build-${BUILD_TARGET}/firmware.bin ~/firmware.bin
+          
 
       - name: Upload firmware artifact
         uses: actions/upload-artifact@v4
         with:
-          name: firmware-${{ matrix.board }}
-          path: ~/${{ matrix.board }}.bin
-          retention-days: 90
+          name: firmware-${{ env.FW_NAME }}
+          path: ~/firmware.bin
+          retention-days: 5