From 9b8736d35faa5a5c5055012c82a93fe4aa565930 Mon Sep 17 00:00:00 2001 From: Manuel Weiser Date: Wed, 19 Feb 2025 09:39:41 +0100 Subject: [PATCH] feat: update Gitea release workflow and increment version to 1.2.23 --- .github/workflows/providers/gitea-release.yml | 99 +++++++++---------- platformio.ini | 2 +- 2 files changed, 49 insertions(+), 52 deletions(-) diff --git a/.github/workflows/providers/gitea-release.yml b/.github/workflows/providers/gitea-release.yml index ae9ff72..960a4ed 100644 --- a/.github/workflows/providers/gitea-release.yml +++ b/.github/workflows/providers/gitea-release.yml @@ -4,60 +4,57 @@ on: workflow_call: inputs: version: - type: string required: true + type: string changelog: - type: string required: true + type: string + +permissions: + contents: write jobs: - release: - runs-on: gitea-runner-1 + build: + runs-on: ubuntu-latest steps: - - name: Debug Info - run: | - echo "Version: ${{ inputs.version }}" - echo "Changelog: ${{ inputs.changelog }}" - echo "Tag: ${GITHUB_REF#refs/tags/}" - - - uses: actions/checkout@v4 - - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: '3.x' - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install platformio esptool - - - name: Build - run: | - pio run -t buildfs - pio run - - - name: Create full firmware - run: | - esptool.py --chip esp32 merge_bin \ - --flash_mode dio \ - --flash_freq 40m \ - --flash_size 4MB \ - -o .pio/build/esp32dev/filaman_full.bin \ - 0x1000 .pio/build/esp32dev/bootloader.bin \ - 0x8000 .pio/build/esp32dev/partitions.bin \ - 0x10000 .pio/build/esp32dev/firmware.bin \ - 0x290000 .pio/build/esp32dev/spiffs.bin - cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin - - - name: Create Release - run: | - TAG="${GITHUB_REF#refs/tags/}" - curl -X POST "${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases" \ - -H "Authorization: token ${GITEA_TOKEN}" \ - -H "Content-Type: application/json" \ - -d "{\"tag_name\":\"$TAG\",\"name\":\"Release ${{ inputs.version }}\",\"body\":\"${{ inputs.changelog }}\",\"draft\":false,\"prerelease\":false}" - env: - GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} - GITEA_API_URL: ${{ secrets.GITEA_API_URL }} - GITEA_REPOSITORY: ${{ secrets.GITEA_REPOSITORY }} \ No newline at end of file + - uses: actions/checkout@v4 + + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: '3.x' + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install --upgrade platformio esptool + + - name: Build Firmware + run: | + pio run -t buildfs + pio run + + - name: Merge firmware and SPIFFS + run: | + esptool.py --chip esp32 merge_bin \ + --flash_mode dio \ + --flash_freq 40m \ + --flash_size 4MB \ + -o .pio/build/esp32dev/filaman_full.bin \ + 0x1000 .pio/build/esp32dev/bootloader.bin \ + 0x8000 .pio/build/esp32dev/partitions.bin \ + 0x10000 .pio/build/esp32dev/firmware.bin \ + 0x290000 .pio/build/esp32dev/spiffs.bin + + - name: Prepare OTA firmware + run: cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin + + - name: Create GitHub Release + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + gh release create "${{ github.ref_name }}" \ + --title "Release ${{ inputs.version }}" \ + --notes "${{ inputs.changelog }}" \ + ".pio/build/esp32dev/filaman_full.bin#filaman_full.bin" \ + ".pio/build/esp32dev/filaman_ota.bin#filaman_ota.bin" \ No newline at end of file diff --git a/platformio.ini b/platformio.ini index dc64363..c7ac177 100644 --- a/platformio.ini +++ b/platformio.ini @@ -9,7 +9,7 @@ ; https://docs.platformio.org/page/projectconf.html [common] -version = "1.2.22" +version = "1.2.23" [env:esp32dev] platform = espressif32