Compare commits
46 Commits
Author | SHA1 | Date | |
---|---|---|---|
c99d802184 | |||
ca15d2abe4 | |||
bddb48ba9a | |||
f4b67e52b8 | |||
00f6a4b0ae | |||
ab3937a69d | |||
0c4bae48d4 | |||
b4b17cb999 | |||
5ff3864d9d | |||
9b8736d35f | |||
cf0ba20637 | |||
e06c0b9a76 | |||
4cb370ddff | |||
0b9c1711da | |||
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 | |||
b13f2c4eee | |||
6d16c35e62 | |||
c94ebf5e33 | |||
9203706a20 |
62
.github/workflows/providers/gitea-release.yml
vendored
62
.github/workflows/providers/gitea-release.yml
vendored
@ -1,20 +1,15 @@
|
||||
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: # This ensures the workflow can only be called from another workflow
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
contents: write
|
||||
contents: write # Required for creating releases
|
||||
issues: read # Required for reading changelog
|
||||
pull-requests: read # Required for reading changelog
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
@ -51,6 +46,7 @@ jobs:
|
||||
|
||||
- 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
|
||||
@ -65,38 +61,20 @@ jobs:
|
||||
echo "$CHANGELOG" >> $GITHUB_OUTPUT
|
||||
echo "EOF" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Create Release
|
||||
env:
|
||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||
GITEA_API_URL: ${{ secrets.GITEA_API_URL }}
|
||||
- name: Install and Configure GitHub CLI
|
||||
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/${GITHUB_REPOSITORY}/releases \
|
||||
-d '{
|
||||
"tag_name": "${{ github.ref_name }}",
|
||||
"name": "Release ${{ steps.get_version.outputs.VERSION }}",
|
||||
"body": "${{ steps.changelog.outputs.CHANGES }}",
|
||||
"draft": false,
|
||||
"prerelease": false
|
||||
}')
|
||||
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
|
||||
|
||||
# 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/${GITHUB_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/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}/assets?name=filaman_ota.bin \
|
||||
--data-binary @.pio/build/esp32dev/filaman_ota.bin
|
||||
- name: Create Release with GitHub CLI
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
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"
|
@ -1,9 +1,7 @@
|
||||
name: GitHub Release
|
||||
name: Github Release
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- 'v*'
|
||||
workflow_call: # This ensures the workflow can only be called from another workflow
|
||||
|
||||
permissions:
|
||||
contents: write # Required for creating releases
|
||||
|
69
.github/workflows/release.yml
vendored
69
.github/workflows/release.yml
vendored
@ -1,4 +1,4 @@
|
||||
name: Release
|
||||
name: Release Workflow
|
||||
|
||||
on:
|
||||
push:
|
||||
@ -6,27 +6,58 @@ on:
|
||||
- 'v*'
|
||||
|
||||
jobs:
|
||||
detect-and-run:
|
||||
route:
|
||||
runs-on: ubuntu-latest
|
||||
outputs:
|
||||
provider: ${{ steps.provider.outputs.provider }}
|
||||
steps:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Debug Environment
|
||||
run: |
|
||||
echo "CI Environment Details:"
|
||||
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: Determine CI Provider
|
||||
id: provider
|
||||
shell: bash
|
||||
run: |
|
||||
# Initialize provider as unknown
|
||||
PROVIDER="unknown"
|
||||
|
||||
# Check for Gitea specific environment first
|
||||
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: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Determine hosting platform
|
||||
id: platform
|
||||
- name: Echo detected provider
|
||||
run: |
|
||||
if [[ "$GITHUB_SERVER_URL" == "https://github.com" ]]; then
|
||||
echo "platform=github" >> $GITHUB_OUTPUT
|
||||
elif [[ "$CI_SERVER_URL" == *"gitlab"* ]]; then
|
||||
echo "platform=gitlab" >> $GITHUB_OUTPUT
|
||||
else
|
||||
echo "platform=gitea" >> $GITHUB_OUTPUT
|
||||
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
|
||||
|
||||
- name: Run GitHub Release
|
||||
if: steps.platform.outputs.platform == 'github'
|
||||
uses: ./.github/workflows/providers/github-release.yml
|
||||
github-release:
|
||||
needs: [route, verify-provider]
|
||||
if: needs.route.outputs.provider == 'github'
|
||||
uses: ./.github/workflows/providers/github-release.yml
|
||||
|
||||
- name: Run Gitea Release
|
||||
if: steps.platform.outputs.platform == 'gitea'
|
||||
uses: ./.github/workflows/providers/gitea-release.yml
|
||||
gitea-release:
|
||||
needs: [route, verify-provider]
|
||||
if: needs.route.outputs.provider == 'gitea'
|
||||
uses: ./.github/workflows/providers/gitea-release.yml
|
116
CHANGELOG.md
116
CHANGELOG.md
@ -1,5 +1,121 @@
|
||||
# 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
|
||||
### 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
|
||||
### 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
|
||||
- update version to 1.2.5; enhance Gitea release workflow and streamline release process
|
||||
|
||||
### Changed
|
||||
- update changelog for version 1.2.5
|
||||
|
||||
|
||||
## [1.2.5] - 2025-02-18
|
||||
### Added
|
||||
- update version to 1.2.5; enhance Gitea release workflow and streamline release process
|
||||
|
||||
|
||||
## [1.2.4] - 2025-02-18
|
||||
### Added
|
||||
- update version to 1.2.4 in HTML files and 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.4"
|
||||
version = "1.2.27"
|
||||
|
||||
[env:esp32dev]
|
||||
platform = espressif32
|
||||
|
Reference in New Issue
Block a user