Compare commits

..

10 Commits

Author SHA1 Message Date
c99d802184 docs: update changelog for version 1.2.27
Some checks failed
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 2s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Failing after 2m49s
2025-02-19 10:12:55 +01:00
ca15d2abe4 feat: enhance CI workflows with provider detection and update version to 1.2.27 2025-02-19 10:12:52 +01:00
bddb48ba9a docs: update changelog for version 1.2.26
Some checks failed
Release Workflow / route (push) Successful in 15s
Release Workflow / gitea-release (push) Has been cancelled
Release Workflow / github-release (push) Has been cancelled
2025-02-19 10:07:45 +01:00
f4b67e52b8 feat: update release workflows for Gitea and GitHub, increment version to 1.2.26 2025-02-19 10:07:41 +01:00
00f6a4b0ae docs: update changelog for version 1.2.25
Some checks failed
Github Release / build (push) Failing after 3m8s
Create Release / build (push) Has been cancelled
2025-02-19 09:43:47 +01:00
ab3937a69d feat: update GitHub release workflows and increment version to 1.2.25 2025-02-19 09:43:44 +01:00
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
5 changed files with 193 additions and 106 deletions

View File

@ -1,25 +1,16 @@
name: Gitea Release name: Gitea Release
on: on:
workflow_call: workflow_call: # This ensures the workflow can only be called from another workflow
inputs:
version:
type: string
required: true
changelog:
type: string
required: true
jobs: jobs:
release: build:
runs-on: gitea-runner-1 runs-on: ubuntu-latest
permissions:
contents: write # Required for creating releases
issues: read # Required for reading changelog
pull-requests: read # Required for reading changelog
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,17 +18,21 @@ jobs:
with: with:
python-version: '3.x' python-version: '3.x'
- name: Install dependencies - name: Install PlatformIO
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install platformio esptool pip install --upgrade platformio
- name: Build - name: Build Firmware
run: | run: |
pio run -t buildfs pio run -t buildfs # Build SPIFFS
pio run pio run # Build firmware
- name: Create full firmware - name: Install esptool
run: |
pip install esptool
- name: Merge firmware and SPIFFS
run: | run: |
esptool.py --chip esp32 merge_bin \ esptool.py --chip esp32 merge_bin \
--flash_mode dio \ --flash_mode dio \
@ -48,16 +43,38 @@ 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
- name: Prepare OTA firmware
run: |
# Use PlatformIO to create a proper OTA image
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
- name: Create Release - name: Get version from tag
id: get_version
run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
- name: Read CHANGELOG.md
id: changelog
run: | run: |
TAG="${GITHUB_REF#refs/tags/}" CHANGELOG=$(awk "/## \\[${{ steps.get_version.outputs.VERSION }}\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
curl -X POST "${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases" \ echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
-H "Authorization: token ${GITEA_TOKEN}" \ echo "$CHANGELOG" >> $GITHUB_OUTPUT
-H "Content-Type: application/json" \ echo "EOF" >> $GITHUB_OUTPUT
-d "{\"tag_name\":\"$TAG\",\"name\":\"Release ${{ inputs.version }}\",\"body\":\"${{ inputs.changelog }}\",\"draft\":false,\"prerelease\":false}"
- name: Install and Configure GitHub CLI
run: |
curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
&& sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \
&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
&& sudo apt update \
&& sudo apt install gh -y
- name: Create Release with GitHub CLI
env: env:
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITEA_API_URL: ${{ secrets.GITEA_API_URL }} run: |
GITEA_REPOSITORY: ${{ secrets.GITEA_REPOSITORY }} gh release create "${{ github.ref_name }}" \
--title "Release ${{ steps.get_version.outputs.VERSION }}" \
--notes "${{ steps.changelog.outputs.CHANGES }}" \
".pio/build/esp32dev/filaman_full.bin#filaman_full.bin" \
".pio/build/esp32dev/filaman_ota.bin#filaman_ota.bin"

View File

@ -1,21 +1,18 @@
name: GitHub Release name: Github Release
on: on:
workflow_call: workflow_call: # This ensures the workflow can only be called from another workflow
inputs:
version:
required: true
type: string
changelog:
required: true
type: string
permissions: permissions:
contents: write contents: write # Required for creating releases
issues: read # Required for reading changelog
pull-requests: read # Required for reading changelog
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
permissions:
contents: write # Required for creating releases at job level
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -24,15 +21,19 @@ jobs:
with: with:
python-version: '3.x' python-version: '3.x'
- name: Install dependencies - name: Install PlatformIO
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install --upgrade platformio esptool pip install --upgrade platformio
- name: Build Firmware - name: Build Firmware
run: | run: |
pio run -t buildfs pio run -t buildfs # Build SPIFFS
pio run pio run # Build firmware
- name: Install esptool
run: |
pip install esptool
- name: Merge firmware and SPIFFS - name: Merge firmware and SPIFFS
run: | run: |
@ -47,14 +48,36 @@ jobs:
0x290000 .pio/build/esp32dev/spiffs.bin 0x290000 .pio/build/esp32dev/spiffs.bin
- name: Prepare OTA firmware - name: Prepare OTA firmware
run: cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin run: |
# Use PlatformIO to create a proper OTA image
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
- name: Create GitHub Release - name: Get version from tag
id: get_version
run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
- name: Read CHANGELOG.md
id: changelog
run: |
CHANGELOG=$(awk "/## \\[${{ steps.get_version.outputs.VERSION }}\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
echo "$CHANGELOG" >> $GITHUB_OUTPUT
echo "EOF" >> $GITHUB_OUTPUT
- name: Install and Configure GitHub CLI
run: |
curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
&& sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \
&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
&& sudo apt update \
&& sudo apt install gh -y
- name: Create Release with GitHub CLI
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: | run: |
gh release create "${{ github.ref_name }}" \ gh release create "${{ github.ref_name }}" \
--title "Release ${{ inputs.version }}" \ --title "Release ${{ steps.get_version.outputs.VERSION }}" \
--notes "${{ inputs.changelog }}" \ --notes "${{ steps.changelog.outputs.CHANGES }}" \
".pio/build/esp32dev/filaman_full.bin#filaman_full.bin" \ ".pio/build/esp32dev/filaman_full.bin#filaman_full.bin" \
".pio/build/esp32dev/filaman_ota.bin#filaman_ota.bin" ".pio/build/esp32dev/filaman_ota.bin#filaman_ota.bin"

View File

@ -1,4 +1,4 @@
name: Release name: Release Workflow
on: on:
push: push:
@ -6,36 +6,58 @@ on:
- 'v*' - 'v*'
jobs: jobs:
prepare: route:
runs-on: gitea-runner runs-on: ubuntu-latest
outputs: outputs:
version: ${{ steps.version.outputs.version }} provider: ${{ steps.provider.outputs.provider }}
changelog: ${{ steps.changelog.outputs.changelog }}
steps: steps:
- uses: actions/checkout@v4 - name: Checkout Repository
uses: actions/checkout@v3
- name: Get version from tag - name: Debug Environment
id: version
run: | run: |
VERSION=${GITHUB_REF#refs/tags/v} echo "CI Environment Details:"
echo "version=$VERSION" >> $GITHUB_OUTPUT echo "GITHUB_ACTIONS=${GITHUB_ACTIONS:-not set}"
echo "GITEA_ACTIONS=${GITEA_ACTIONS:-not set}"
echo "GITEA_REPOSITORY=${GITEA_REPOSITORY:-not set}"
echo "RUNNER_NAME=${RUNNER_NAME:-not set}"
- name: Get changelog - name: Determine CI Provider
id: changelog id: provider
shell: bash
run: | run: |
echo "$CHANGELOG" >> $GITHUB_OUTPUT # Initialize provider as unknown
echo "EOF" >> $GITHUB_OUTPUT PROVIDER="unknown"
- name: Run GitHub Release # Check for Gitea specific environment first
if: github.server_url == 'https://github.com' if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then
PROVIDER="gitea"
# Then check for GitHub
elif [ "${GITHUB_ACTIONS}" = "true" ]; then
PROVIDER="github"
fi
echo "Detected provider: ${PROVIDER}"
echo "provider=${PROVIDER}" >> "${GITHUB_OUTPUT}"
verify-provider:
needs: route
runs-on: ubuntu-latest
steps:
- name: Echo detected provider
run: |
echo "Detected CI Provider: ${{ needs.route.outputs.provider }}"
if [ "${{ needs.route.outputs.provider }}" = "unknown" ]; then
echo "::error::Failed to detect CI provider!"
exit 1
fi
github-release:
needs: [route, verify-provider]
if: needs.route.outputs.provider == 'github'
uses: ./.github/workflows/providers/github-release.yml uses: ./.github/workflows/providers/github-release.yml
with:
version: ${{ steps.version.outputs.version }}
changelog: ${{ steps.changelog.outputs.changelog }}
- name: Run Gitea Release gitea-release:
if: github.server_url != 'https://gitlab.fire-devils.org' needs: [route, verify-provider]
if: needs.route.outputs.provider == 'gitea'
uses: ./.github/workflows/providers/gitea-release.yml uses: ./.github/workflows/providers/gitea-release.yml
with:
version: ${{ steps.version.outputs.version }}
changelog: ${{ steps.changelog.outputs.changelog }}

View File

@ -1,5 +1,30 @@
# Changelog # Changelog
## [1.2.27] - 2025-02-19
### Added
- enhance CI workflows with provider detection and update version to 1.2.27
## [1.2.26] - 2025-02-19
### Added
- update release workflows for Gitea and GitHub, increment version to 1.2.26
## [1.2.25] - 2025-02-19
### Added
- update GitHub release workflows and increment version to 1.2.25
## [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 ## [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.22" version = "1.2.27"
[env:esp32dev] [env:esp32dev]
platform = espressif32 platform = espressif32