Compare commits
12 Commits
Author | SHA1 | Date | |
---|---|---|---|
c99d802184 | |||
ca15d2abe4 | |||
bddb48ba9a | |||
f4b67e52b8 | |||
00f6a4b0ae | |||
ab3937a69d | |||
0c4bae48d4 | |||
b4b17cb999 | |||
5ff3864d9d | |||
9b8736d35f | |||
cf0ba20637 | |||
e06c0b9a76 |
129
.github/workflows/providers/gitea-release.yml
vendored
129
.github/workflows/providers/gitea-release.yml
vendored
@ -1,63 +1,80 @@
|
|||||||
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
|
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
|
- uses: actions/checkout@v4
|
||||||
run: |
|
|
||||||
echo "Version: ${{ inputs.version }}"
|
- name: Set up Python
|
||||||
echo "Changelog: ${{ inputs.changelog }}"
|
uses: actions/setup-python@v4
|
||||||
echo "Tag: ${GITHUB_REF#refs/tags/}"
|
with:
|
||||||
|
python-version: '3.x'
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
- name: Install PlatformIO
|
||||||
|
run: |
|
||||||
|
python -m pip install --upgrade pip
|
||||||
|
pip install --upgrade platformio
|
||||||
|
|
||||||
|
- name: Build Firmware
|
||||||
|
run: |
|
||||||
|
pio run -t buildfs # Build SPIFFS
|
||||||
|
pio run # Build firmware
|
||||||
|
|
||||||
|
- name: Install esptool
|
||||||
|
run: |
|
||||||
|
pip install esptool
|
||||||
|
|
||||||
|
- 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: |
|
||||||
|
# Use PlatformIO to create a proper OTA image
|
||||||
|
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
|
||||||
|
|
||||||
|
- name: Get version from tag
|
||||||
|
id: get_version
|
||||||
|
run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
- name: Set up Python
|
- name: Read CHANGELOG.md
|
||||||
uses: actions/setup-python@v4
|
id: changelog
|
||||||
with:
|
run: |
|
||||||
python-version: '3.x'
|
CHANGELOG=$(awk "/## \\[${{ steps.get_version.outputs.VERSION }}\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
|
||||||
|
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
|
||||||
- name: Install dependencies
|
echo "$CHANGELOG" >> $GITHUB_OUTPUT
|
||||||
run: |
|
echo "EOF" >> $GITHUB_OUTPUT
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install platformio esptool
|
- name: Install and Configure GitHub CLI
|
||||||
|
run: |
|
||||||
- name: Build
|
curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
|
||||||
run: |
|
&& sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \
|
||||||
pio run -t buildfs
|
&& 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 \
|
||||||
pio run
|
&& sudo apt update \
|
||||||
|
&& sudo apt install gh -y
|
||||||
- name: Create full firmware
|
|
||||||
run: |
|
- name: Create Release with GitHub CLI
|
||||||
esptool.py --chip esp32 merge_bin \
|
env:
|
||||||
--flash_mode dio \
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
--flash_freq 40m \
|
run: |
|
||||||
--flash_size 4MB \
|
gh release create "${{ github.ref_name }}" \
|
||||||
-o .pio/build/esp32dev/filaman_full.bin \
|
--title "Release ${{ steps.get_version.outputs.VERSION }}" \
|
||||||
0x1000 .pio/build/esp32dev/bootloader.bin \
|
--notes "${{ steps.changelog.outputs.CHANGES }}" \
|
||||||
0x8000 .pio/build/esp32dev/partitions.bin \
|
".pio/build/esp32dev/filaman_full.bin#filaman_full.bin" \
|
||||||
0x10000 .pio/build/esp32dev/firmware.bin \
|
".pio/build/esp32dev/filaman_ota.bin#filaman_ota.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 }}
|
|
61
.github/workflows/providers/github-release.yml
vendored
61
.github/workflows/providers/github-release.yml
vendored
@ -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"
|
82
.github/workflows/release.yml
vendored
82
.github/workflows/release.yml
vendored
@ -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
|
|
||||||
id: version
|
- name: Debug Environment
|
||||||
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}"
|
||||||
- name: Get changelog
|
echo "GITEA_REPOSITORY=${GITEA_REPOSITORY:-not set}"
|
||||||
id: changelog
|
echo "RUNNER_NAME=${RUNNER_NAME:-not set}"
|
||||||
|
|
||||||
|
- name: Determine CI Provider
|
||||||
|
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
|
||||||
uses: ./.github/workflows/providers/github-release.yml
|
PROVIDER="gitea"
|
||||||
with:
|
# Then check for GitHub
|
||||||
version: ${{ steps.version.outputs.version }}
|
elif [ "${GITHUB_ACTIONS}" = "true" ]; then
|
||||||
changelog: ${{ steps.changelog.outputs.changelog }}
|
PROVIDER="github"
|
||||||
|
fi
|
||||||
- name: Run Gitea Release
|
|
||||||
if: github.server_url != 'https://gitlab.fire-devils.org'
|
echo "Detected provider: ${PROVIDER}"
|
||||||
uses: ./.github/workflows/providers/gitea-release.yml
|
echo "provider=${PROVIDER}" >> "${GITHUB_OUTPUT}"
|
||||||
with:
|
|
||||||
version: ${{ steps.version.outputs.version }}
|
verify-provider:
|
||||||
changelog: ${{ steps.changelog.outputs.changelog }}
|
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
|
||||||
|
|
||||||
|
gitea-release:
|
||||||
|
needs: [route, verify-provider]
|
||||||
|
if: needs.route.outputs.provider == 'gitea'
|
||||||
|
uses: ./.github/workflows/providers/gitea-release.yml
|
30
CHANGELOG.md
30
CHANGELOG.md
@ -1,5 +1,35 @@
|
|||||||
# 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
|
||||||
|
### Added
|
||||||
|
- update Gitea runner configuration and increment version to 1.2.22
|
||||||
|
|
||||||
|
|
||||||
## [1.2.21] - 2025-02-19
|
## [1.2.21] - 2025-02-19
|
||||||
### Added
|
### Added
|
||||||
- update Gitea release condition and increment version to 1.2.21
|
- update Gitea release condition and increment version to 1.2.21
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
; https://docs.platformio.org/page/projectconf.html
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
[common]
|
[common]
|
||||||
version = "1.2.21"
|
version = "1.2.27"
|
||||||
|
|
||||||
[env:esp32dev]
|
[env:esp32dev]
|
||||||
platform = espressif32
|
platform = espressif32
|
||||||
|
Reference in New Issue
Block a user