From 5a91e87afa321d2cc9f4a53904d735c6d4c2aca6 Mon Sep 17 00:00:00 2001 From: Manuel Weiser Date: Wed, 19 Feb 2025 01:21:14 +0100 Subject: [PATCH] feat: update release workflows for GitHub and Gitea, increment version to 1.2.20 --- .github/workflows/release.yml | 74 ++++++----------------------------- platformio.ini | 2 +- 2 files changed, 13 insertions(+), 63 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6a5225a..bb6411a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,69 +23,19 @@ jobs: - name: Get changelog id: changelog run: | - CHANGELOG=$(awk "/## \\[${{ steps.version.outputs.version }}\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md) - echo "changelog<> $GITHUB_OUTPUT echo "$CHANGELOG" >> $GITHUB_OUTPUT echo "EOF" >> $GITHUB_OUTPUT - - github: - needs: prepare - if: github.server_url == 'https://github.com' - uses: ./.github/workflows/providers/github-release.yml - with: - version: ${{ needs.prepare.outputs.version }} - changelog: ${{ needs.prepare.outputs.changelog }} - secrets: inherit - - gitea: - needs: prepare - if: github.server_url != 'https://github.com' - runs-on: gitea-runner - steps: - - uses: actions/checkout@v4 - - name: Set up Python - uses: actions/setup-python@v4 + - name: Run GitHub Release + if: github.server_url == 'https://github.com' + uses: ./.github/workflows/providers/github-release.yml 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 - env: - GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} - GITEA_API_URL: ${{ secrets.GITEA_API_URL }} - GITEA_REPOSITORY: ${{ secrets.GITEA_REPOSITORY }} - run: | - echo "Creating release for version ${{ needs.prepare.outputs.version }}" - curl -X POST "${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases" \ - -H "Authorization: token ${GITEA_TOKEN}" \ - -H "Content-Type: application/json" \ - -d "{ - \"tag_name\": \"${GITHUB_REF#refs/tags/}\", - \"name\": \"Release ${{ needs.prepare.outputs.version }}\", - \"body\": \"${{ needs.prepare.outputs.changelog }}\", - \"draft\": false, - \"prerelease\": false - }" \ No newline at end of file + version: ${{ steps.version.outputs.version }} + changelog: ${{ steps.changelog.outputs.changelog }} + + - name: Run Gitea Release + if: github.server_url != 'https://github.com' + uses: ./.github/workflows/providers/gitea-release.yml + with: + version: ${{ steps.version.outputs.version }} + changelog: ${{ steps.changelog.outputs.changelog }} \ No newline at end of file diff --git a/platformio.ini b/platformio.ini index 99ca130..e778977 100644 --- a/platformio.ini +++ b/platformio.ini @@ -9,7 +9,7 @@ ; https://docs.platformio.org/page/projectconf.html [common] -version = "1.2.19" +version = "1.2.20" [env:esp32dev] platform = espressif32