Compare commits
28 Commits
Author | SHA1 | Date | |
---|---|---|---|
e2449030c5 | |||
5a91e87afa | |||
5e66c3bd45 | |||
61c82f796f | |||
7661e0eb20 | |||
c06e6de89a | |||
262bed84df | |||
c710e5d7f8 | |||
5d39f04786 | |||
d955e26b82 | |||
c20e7de5c3 | |||
55c3b3688a | |||
fea5932125 | |||
04f557939d | |||
58549a53e4 | |||
64a46e3e7d | |||
c2bd0982ab | |||
e0b8da079e | |||
8c88827a2d | |||
6128bc2827 | |||
6d21a8ec52 | |||
2ee4eca7dd | |||
9eb64e06f0 | |||
693ef4e26c | |||
11c099eba2 | |||
c7c122a505 | |||
d1bb4b7c83 | |||
dc5118587c |
152
.github/workflows/providers/gitea-release.yml
vendored
152
.github/workflows/providers/gitea-release.yml
vendored
@ -1,103 +1,63 @@
|
||||
name: Gitea Release
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- 'v*'
|
||||
|
||||
permissions:
|
||||
contents: write # Required for creating releases
|
||||
issues: read # Required for reading changelog
|
||||
pull-requests: read # Required for reading changelog
|
||||
workflow_call:
|
||||
inputs:
|
||||
version:
|
||||
type: string
|
||||
required: true
|
||||
changelog:
|
||||
type: string
|
||||
required: true
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
contents: write
|
||||
release:
|
||||
runs-on: gitea-runner
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Set up Python
|
||||
uses: actions/setup-python@v4
|
||||
with:
|
||||
python-version: '3.x'
|
||||
|
||||
- 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: |
|
||||
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: Debug Info
|
||||
run: |
|
||||
echo "Version: ${{ inputs.version }}"
|
||||
echo "Changelog: ${{ inputs.changelog }}"
|
||||
echo "Tag: ${GITHUB_REF#refs/tags/}"
|
||||
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- 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: Create Release
|
||||
env:
|
||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||
GITEA_API_URL: ${{ secrets.GITEA_API_URL }}
|
||||
GITEA_REPOSITORY: ${{ secrets.GITEA_REPOSITORY }}
|
||||
run: |
|
||||
# Create release using Gitea API
|
||||
RESPONSE=$(curl -X POST \
|
||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-H "accept: application/json" \
|
||||
"${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases" \
|
||||
-d '{
|
||||
"tag_name": "${{ github.ref_name }}",
|
||||
"name": "Release ${{ steps.get_version.outputs.VERSION }}",
|
||||
"body": "${{ steps.changelog.outputs.CHANGES }}",
|
||||
"draft": false,
|
||||
"prerelease": false
|
||||
}')
|
||||
|
||||
# Extract release ID from response
|
||||
RELEASE_ID=$(echo $RESPONSE | jq -r .id)
|
||||
|
||||
# Upload full firmware
|
||||
curl -X POST \
|
||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||
-H "Content-Type: application/octet-stream" \
|
||||
"${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases/${RELEASE_ID}/assets?name=filaman_full.bin" \
|
||||
--data-binary @.pio/build/esp32dev/filaman_full.bin
|
||||
|
||||
# Upload OTA firmware
|
||||
curl -X POST \
|
||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||
-H "Content-Type: application/octet-stream" \
|
||||
"${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases/${RELEASE_ID}/assets?name=filaman_ota.bin" \
|
||||
--data-binary @.pio/build/esp32dev/filaman_ota.bin
|
||||
- name: Set up Python
|
||||
uses: actions/setup-python@v4
|
||||
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
|
||||
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,20 +1,21 @@
|
||||
name: GitHub Release
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- 'v*'
|
||||
workflow_call:
|
||||
inputs:
|
||||
version:
|
||||
required: true
|
||||
type: string
|
||||
changelog:
|
||||
required: true
|
||||
type: string
|
||||
|
||||
permissions:
|
||||
contents: write # Required for creating releases
|
||||
issues: read # Required for reading changelog
|
||||
pull-requests: read # Required for reading changelog
|
||||
contents: write
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
contents: write # Required for creating releases at job level
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
@ -23,19 +24,15 @@ jobs:
|
||||
with:
|
||||
python-version: '3.x'
|
||||
|
||||
- name: Install PlatformIO
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
python -m pip install --upgrade pip
|
||||
pip install --upgrade platformio
|
||||
pip install --upgrade platformio esptool
|
||||
|
||||
- name: Build Firmware
|
||||
run: |
|
||||
pio run -t buildfs # Build SPIFFS
|
||||
pio run # Build firmware
|
||||
|
||||
- name: Install esptool
|
||||
run: |
|
||||
pip install esptool
|
||||
pio run -t buildfs
|
||||
pio run
|
||||
|
||||
- name: Merge firmware and SPIFFS
|
||||
run: |
|
||||
@ -50,36 +47,14 @@ jobs:
|
||||
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
|
||||
run: 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: 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
|
||||
- name: Create GitHub Release
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
gh release create "${{ github.ref_name }}" \
|
||||
--title "Release ${{ steps.get_version.outputs.VERSION }}" \
|
||||
--notes "${{ steps.changelog.outputs.CHANGES }}" \
|
||||
--title "Release ${{ inputs.version }}" \
|
||||
--notes "${{ inputs.changelog }}" \
|
||||
".pio/build/esp32dev/filaman_full.bin#filaman_full.bin" \
|
||||
".pio/build/esp32dev/filaman_ota.bin#filaman_ota.bin"
|
49
.github/workflows/release.yml
vendored
49
.github/workflows/release.yml
vendored
@ -6,25 +6,36 @@ on:
|
||||
- 'v*'
|
||||
|
||||
jobs:
|
||||
detect-and-run:
|
||||
runs-on: ubuntu-latest
|
||||
prepare:
|
||||
runs-on: gitea-runner
|
||||
outputs:
|
||||
version: ${{ steps.version.outputs.version }}
|
||||
changelog: ${{ steps.changelog.outputs.changelog }}
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Determine hosting platform
|
||||
id: platform
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Get version from tag
|
||||
id: version
|
||||
run: |
|
||||
if [[ "$GITHUB_SERVER_URL" == "https://github.com" ]]; then
|
||||
echo "platform=github" >> $GITHUB_OUTPUT
|
||||
else
|
||||
echo "platform=gitea" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
|
||||
- name: Run Release Workflow
|
||||
VERSION=${GITHUB_REF#refs/tags/v}
|
||||
echo "version=$VERSION" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Get changelog
|
||||
id: changelog
|
||||
run: |
|
||||
if [[ "${{ steps.platform.outputs.platform }}" == "github" ]]; then
|
||||
./.github/workflows/providers/github-release.sh
|
||||
else
|
||||
./.github/workflows/providers/gitea-release.sh
|
||||
fi
|
||||
echo "$CHANGELOG" >> $GITHUB_OUTPUT
|
||||
echo "EOF" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Run GitHub Release
|
||||
if: github.server_url == 'https://github.com'
|
||||
uses: ./.github/workflows/providers/github-release.yml
|
||||
with:
|
||||
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 }}
|
67
CHANGELOG.md
67
CHANGELOG.md
@ -1,5 +1,72 @@
|
||||
# Changelog
|
||||
|
||||
## [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
|
||||
### Added
|
||||
- add Gitea and GitHub release workflows for version 1.2.19
|
||||
|
||||
|
||||
## [1.2.18] - 2025-02-19
|
||||
### Added
|
||||
- remove Gitea and GitHub release workflows and increment version to 1.2.18
|
||||
|
||||
|
||||
## [1.2.17] - 2025-02-19
|
||||
### Added
|
||||
- update Gitea release workflow for version 1.2.17 and improve job structure
|
||||
|
||||
|
||||
## [1.2.16] - 2025-02-19
|
||||
### Added
|
||||
- update Gitea release workflow and increment version to 1.2.16
|
||||
|
||||
|
||||
## [1.2.15] - 2025-02-19
|
||||
### Added
|
||||
- update version to 1.2.15 and clean up Gitea release workflow
|
||||
|
||||
|
||||
## [1.2.14] - 2025-02-19
|
||||
### Added
|
||||
- update version to 1.2.14 and refactor release workflows for improved GitHub and Gitea support
|
||||
|
||||
|
||||
## [1.2.13] - 2025-02-19
|
||||
### Added
|
||||
- update version to 1.2.13 and enhance release workflow with Python setup and Gitea support
|
||||
|
||||
|
||||
## [1.2.12] - 2025-02-19
|
||||
### Added
|
||||
- update version to 1.2.12 and refactor release workflows for improved provider detection and execution
|
||||
|
||||
|
||||
## [1.2.11] - 2025-02-18
|
||||
### Added
|
||||
- update version to 1.2.11 and enhance GitHub and Gitea release workflows with input validation and improved error handling
|
||||
|
||||
|
||||
## [1.2.10] - 2025-02-18
|
||||
### Added
|
||||
- enhance Gitea release workflow with API connection verification and URL validation; update version to 1.2.10
|
||||
|
||||
|
||||
## [1.2.9] - 2025-02-18
|
||||
### Added
|
||||
- update version to 1.2.9 in platformio.ini
|
||||
- refactor GitHub and Gitea release workflows for improved version handling and firmware uploads
|
||||
|
||||
|
||||
## [1.2.8] - 2025-02-18
|
||||
### Added
|
||||
- update version to 1.2.8 in platformio.ini; refactor Gitea and GitHub release workflows
|
||||
- update version to 1.2.7 in platformio.ini; adjust Gitea release workflow
|
||||
|
||||
|
||||
## [1.2.6] - 2025-02-18
|
||||
### Added
|
||||
- update version to 1.2.6 in platformio.ini
|
||||
|
18
README.md
18
README.md
@ -124,6 +124,24 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z
|
||||
- Configure WiFi settings through the captive portal.
|
||||
- Access the web interface at `http://filaman.local` or the IP address.
|
||||
|
||||
## GitHub Actions Configuration
|
||||
|
||||
### Required Secrets for Gitea Releases
|
||||
|
||||
When using Gitea as your repository host, you need to configure the following secrets in your repository:
|
||||
|
||||
- `GITEA_API_URL`: The base URL of your Gitea instance, including protocol (e.g., `https://git.example.com`)
|
||||
- `GITEA_TOKEN`: Your Gitea access token with permissions to create releases
|
||||
- `GITEA_REPOSITORY`: The repository name in format `owner/repo` (e.g., `username/filaman`)
|
||||
|
||||
Example values:
|
||||
```
|
||||
GITEA_API_URL=https://git.example.com
|
||||
GITEA_TOKEN=abcdef1234567890
|
||||
GITEA_REPOSITORY=username/filaman
|
||||
```
|
||||
|
||||
Make sure to set these secrets in your repository settings under Settings > Secrets and Variables > Actions.
|
||||
|
||||
## Documentation
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
; https://docs.platformio.org/page/projectconf.html
|
||||
|
||||
[common]
|
||||
version = "1.2.6"
|
||||
version = "1.2.20"
|
||||
|
||||
[env:esp32dev]
|
||||
platform = espressif32
|
||||
|
Reference in New Issue
Block a user