From b7651ad50dc9a29a6fd67753e84db26669003fe9 Mon Sep 17 00:00:00 2001 From: Manuel Weiser Date: Thu, 20 Feb 2025 17:11:22 +0100 Subject: [PATCH] refactor: update Gitea and GitHub release workflows to use esp32dev_ota for building and uploading firmware and SPIFFS binaries --- .github/workflows/providers/gitea-release.yml | 12 ++++++------ .github/workflows/providers/github-release.yml | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/providers/gitea-release.yml b/.github/workflows/providers/gitea-release.yml index 81eaad8..327ae51 100644 --- a/.github/workflows/providers/gitea-release.yml +++ b/.github/workflows/providers/gitea-release.yml @@ -34,14 +34,14 @@ jobs: - name: Build Firmware run: | - pio run -t buildfs # Build SPIFFS - pio run # Build firmware - cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman.bin - cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/filaman_spiffs.bin + pio run -e esp32dev_ota -t buildfs # Build SPIFFS + pio run -e esp32dev_ota # Build firmware + cp .pio/build/esp32dev_ota/firmware.bin .pio/build/esp32dev_ota/filaman.bin + cp .pio/build/esp32dev_ota/spiffs.bin .pio/build/esp32dev_ota/filaman_spiffs.bin - name: Prepare binaries run: | - cd .pio/build/esp32dev + cd .pio/build/esp32dev_ota # Create OTA binary (firmware only) cp firmware.bin filaman_ota.bin @@ -94,7 +94,7 @@ jobs: echo "Release created with ID: $RELEASE_ID" # Upload binaries - cd .pio/build/esp32dev + cd .pio/build/esp32dev_ota for file in filaman_full.bin filaman_ota.bin filaman.bin filaman_spiffs.bin; do echo "Uploading $file..." curl -k -s \ diff --git a/.github/workflows/providers/github-release.yml b/.github/workflows/providers/github-release.yml index 856632b..adefd05 100644 --- a/.github/workflows/providers/github-release.yml +++ b/.github/workflows/providers/github-release.yml @@ -23,14 +23,14 @@ jobs: - name: Build Firmware run: | - pio run -t buildfs # Build SPIFFS - pio run # Build firmware - cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman.bin - cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/filaman_spiffs.bin + pio run -e esp32dev_ota -t buildfs # Build SPIFFS + pio run -e esp32dev_ota # Build firmware + cp .pio/build/esp32dev_ota/firmware.bin .pio/build/esp32dev_ota/filaman.bin + cp .pio/build/esp32dev_ota/spiffs.bin .pio/build/esp32dev_ota/filaman_spiffs.bin - name: Prepare binaries run: | - cd .pio/build/esp32dev + cd .pio/build/esp32dev_ota # Debug: Show all generated files echo "Files in build directory:" @@ -87,7 +87,7 @@ jobs: gh release create "${{ github.ref_name }}" \ --title "Release ${{ steps.get_version.outputs.VERSION }}" \ --notes "${{ steps.changelog.outputs.CHANGES }}" \ - .pio/build/esp32dev/filaman_full.bin \ - .pio/build/esp32dev/filaman_ota.bin \ - .pio/build/esp32dev/filaman.bin \ - .pio/build/esp32dev/filaman_spiffs.bin \ No newline at end of file + .pio/build/esp32dev_ota/filaman_full.bin \ + .pio/build/esp32dev_ota/filaman_ota.bin \ + .pio/build/esp32dev_ota/filaman.bin \ + .pio/build/esp32dev_ota/filaman_spiffs.bin \ No newline at end of file