Compare commits

...

10 Commits

Author SHA1 Message Date
0c4bae48d4 docs: update changelog for version 1.2.24 2025-02-19 09:40:33 +01:00
b4b17cb999 feat: update GitHub release workflow and increment version to 1.2.24 2025-02-19 09:40:30 +01:00
5ff3864d9d docs: update changelog for version 1.2.23
Some checks failed
Release / prepare (push) Has been cancelled
2025-02-19 09:39:43 +01:00
9b8736d35f feat: update Gitea release workflow and increment version to 1.2.23 2025-02-19 09:39:41 +01:00
cf0ba20637 docs: update changelog for version 1.2.22
Some checks failed
Release / prepare (push) Has been cancelled
2025-02-19 09:27:21 +01:00
e06c0b9a76 feat: update Gitea runner configuration and increment version to 1.2.22 2025-02-19 09:27:18 +01:00
4cb370ddff docs: update changelog for version 1.2.21
Some checks failed
Release / prepare (push) Has been cancelled
2025-02-19 01:30:59 +01:00
0b9c1711da feat: update Gitea release condition and increment version to 1.2.21 2025-02-19 01:30:46 +01:00
e2449030c5 docs: update changelog for version 1.2.20
Some checks failed
Release / prepare (push) Has been cancelled
2025-02-19 01:21:23 +01:00
5a91e87afa feat: update release workflows for GitHub and Gitea, increment version to 1.2.20 2025-02-19 01:21:14 +01:00
4 changed files with 128 additions and 137 deletions

View File

@ -4,60 +4,57 @@ on:
workflow_call: workflow_call:
inputs: inputs:
version: version:
type: string
required: true required: true
type: string
changelog: changelog:
type: string
required: true required: true
type: string
permissions:
contents: write
jobs: jobs:
release: build:
runs-on: gitea-runner runs-on: ubuntu-latest
steps: steps:
- name: Debug Info - uses: actions/checkout@v4
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: Set up Python - name: Install dependencies
uses: actions/setup-python@v4 run: |
with: python -m pip install --upgrade pip
python-version: '3.x' pip install --upgrade platformio esptool
- name: Install dependencies - name: Build Firmware
run: | run: |
python -m pip install --upgrade pip pio run -t buildfs
pip install platformio esptool pio run
- name: Build - name: Merge firmware and SPIFFS
run: | run: |
pio run -t buildfs esptool.py --chip esp32 merge_bin \
pio run --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: Create full firmware - name: Prepare OTA firmware
run: | run: cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
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 - name: Create GitHub Release
run: | env:
TAG="${GITHUB_REF#refs/tags/}" GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
curl -X POST "${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases" \ run: |
-H "Authorization: token ${GITEA_TOKEN}" \ gh release create "${{ github.ref_name }}" \
-H "Content-Type: application/json" \ --title "Release ${{ inputs.version }}" \
-d "{\"tag_name\":\"$TAG\",\"name\":\"Release ${{ inputs.version }}\",\"body\":\"${{ inputs.changelog }}\",\"draft\":false,\"prerelease\":false}" --notes "${{ inputs.changelog }}" \
env: ".pio/build/esp32dev/filaman_full.bin#filaman_full.bin" \
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} ".pio/build/esp32dev/filaman_ota.bin#filaman_ota.bin"
GITEA_API_URL: ${{ secrets.GITEA_API_URL }}
GITEA_REPOSITORY: ${{ secrets.GITEA_REPOSITORY }}

View File

@ -1,91 +1,60 @@
name: Release name: GitHub Release
on: on:
push: workflow_call:
tags: inputs:
- 'v*' version:
required: true
type: string
changelog:
required: true
type: string
permissions:
contents: write
jobs: jobs:
prepare: build:
runs-on: gitea-runner runs-on: ubuntu-latest
outputs:
version: ${{ steps.version.outputs.version }}
changelog: ${{ steps.changelog.outputs.changelog }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Get version from tag - name: Set up Python
id: version uses: actions/setup-python@v4
run: | with:
VERSION=${GITHUB_REF#refs/tags/v} python-version: '3.x'
echo "version=$VERSION" >> $GITHUB_OUTPUT
- name: Get changelog - name: Install dependencies
id: changelog run: |
run: | python -m pip install --upgrade pip
CHANGELOG=$(awk "/## \\[${{ steps.version.outputs.version }}\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md) pip install --upgrade platformio esptool
echo "changelog<<EOF" >> $GITHUB_OUTPUT
echo "$CHANGELOG" >> $GITHUB_OUTPUT
echo "EOF" >> $GITHUB_OUTPUT
github: - name: Build Firmware
needs: prepare run: |
if: github.server_url == 'https://github.com' pio run -t buildfs
uses: ./.github/workflows/providers/github-release.yml pio run
with:
version: ${{ needs.prepare.outputs.version }}
changelog: ${{ needs.prepare.outputs.changelog }}
secrets: inherit
gitea: - name: Merge firmware and SPIFFS
needs: prepare run: |
if: github.server_url != 'https://github.com' esptool.py --chip esp32 merge_bin \
runs-on: gitea-runner --flash_mode dio \
steps: --flash_freq 40m \
- uses: actions/checkout@v4 --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: Set up Python - name: Prepare OTA firmware
uses: actions/setup-python@v4 run: cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
with:
python-version: '3.x'
- name: Install dependencies - name: Create GitHub Release
run: | env:
python -m pip install --upgrade pip GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
pip install platformio esptool run: |
gh release create "${{ github.ref_name }}" \
- name: Build --title "Release ${{ inputs.version }}" \
run: | --notes "${{ inputs.changelog }}" \
pio run -t buildfs ".pio/build/esp32dev/filaman_full.bin#filaman_full.bin" \
pio run ".pio/build/esp32dev/filaman_ota.bin#filaman_ota.bin"
- 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
}"

View File

@ -1,5 +1,30 @@
# Changelog # Changelog
## [1.2.24] - 2025-02-19
### Added
- update GitHub release workflow and increment version to 1.2.24
## [1.2.23] - 2025-02-19
### Added
- update Gitea release workflow and increment version to 1.2.23
## [1.2.22] - 2025-02-19
### Added
- update Gitea runner configuration and increment version to 1.2.22
## [1.2.21] - 2025-02-19
### Added
- update Gitea release condition and increment version to 1.2.21
## [1.2.20] - 2025-02-19
### Added
- update release workflows for GitHub and Gitea, increment version to 1.2.20
## [1.2.19] - 2025-02-19 ## [1.2.19] - 2025-02-19
### Added ### Added
- add Gitea and GitHub release workflows for version 1.2.19 - add Gitea and GitHub release workflows for version 1.2.19

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.19" version = "1.2.24"
[env:esp32dev] [env:esp32dev]
platform = espressif32 platform = espressif32