Compare commits

..

No commits in common. "5ff3864d9da52c2f74fd6d76bfa2d7c3c8fd9aa7" and "cf0ba20637ba41c23e114e1e9809b86866c198af" have entirely different histories.

3 changed files with 52 additions and 54 deletions

View File

@ -4,19 +4,22 @@ on:
workflow_call: workflow_call:
inputs: inputs:
version: version:
required: true
type: string type: string
required: true
changelog: changelog:
required: true
type: string type: string
required: true
permissions:
contents: write
jobs: jobs:
build: release:
runs-on: ubuntu-latest runs-on: gitea-runner-1
steps: steps:
- name: Debug Info
run: |
echo "Version: ${{ inputs.version }}"
echo "Changelog: ${{ inputs.changelog }}"
echo "Tag: ${GITHUB_REF#refs/tags/}"
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Set up Python - name: Set up Python
@ -27,14 +30,14 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install --upgrade platformio esptool pip install platformio esptool
- name: Build Firmware - name: Build
run: | run: |
pio run -t buildfs pio run -t buildfs
pio run pio run
- name: Merge firmware and SPIFFS - name: Create full firmware
run: | run: |
esptool.py --chip esp32 merge_bin \ esptool.py --chip esp32 merge_bin \
--flash_mode dio \ --flash_mode dio \
@ -45,16 +48,16 @@ jobs:
0x8000 .pio/build/esp32dev/partitions.bin \ 0x8000 .pio/build/esp32dev/partitions.bin \
0x10000 .pio/build/esp32dev/firmware.bin \ 0x10000 .pio/build/esp32dev/firmware.bin \
0x290000 .pio/build/esp32dev/spiffs.bin 0x290000 .pio/build/esp32dev/spiffs.bin
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
- name: Prepare OTA firmware - name: Create Release
run: cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
- name: Create GitHub Release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: | run: |
gh release create "${{ github.ref_name }}" \ TAG="${GITHUB_REF#refs/tags/}"
--title "Release ${{ inputs.version }}" \ curl -X POST "${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases" \
--notes "${{ inputs.changelog }}" \ -H "Authorization: token ${GITEA_TOKEN}" \
".pio/build/esp32dev/filaman_full.bin#filaman_full.bin" \ -H "Content-Type: application/json" \
".pio/build/esp32dev/filaman_ota.bin#filaman_ota.bin" -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 }}

View File

@ -1,10 +1,5 @@
# Changelog # Changelog
## [1.2.23] - 2025-02-19
### Added
- update Gitea release workflow and increment version to 1.2.23
## [1.2.22] - 2025-02-19 ## [1.2.22] - 2025-02-19
### Added ### Added
- update Gitea runner configuration and increment version to 1.2.22 - update Gitea runner configuration and increment version to 1.2.22

View File

@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html ; https://docs.platformio.org/page/projectconf.html
[common] [common]
version = "1.2.23" version = "1.2.22"
[env:esp32dev] [env:esp32dev]
platform = espressif32 platform = espressif32