Compare commits
16 Commits
v1.2.36
...
7ae26fb0a9
Author | SHA1 | Date | |
---|---|---|---|
7ae26fb0a9 | |||
98bcf98f1e | |||
bc8ac32fee | |||
ba74eca21d | |||
d4e1cf1322 | |||
5170784e44 | |||
ac323167d0 | |||
003de5bc00 | |||
83595cfadf | |||
cfe21d63d7 | |||
63e72076ed | |||
2a011ee244 | |||
84dd2bd40b | |||
1449cacc0e | |||
f1c2b2eb87 | |||
0f1a3b1d5b |
150
.github/workflows/providers/gitea-release.yml
vendored
150
.github/workflows/providers/gitea-release.yml
vendored
@ -3,11 +3,18 @@ name: Gitea Release
|
||||
on:
|
||||
workflow_call:
|
||||
inputs:
|
||||
server_url:
|
||||
description: 'Gitea server URL'
|
||||
required: false
|
||||
gitea_ref_name:
|
||||
description: 'Gitea ref name'
|
||||
required: true
|
||||
type: string
|
||||
gitea_server_url:
|
||||
description: 'Gitea server URL'
|
||||
required: true
|
||||
type: string
|
||||
gitea_repository:
|
||||
description: 'Gitea repository'
|
||||
required: true
|
||||
type: string
|
||||
default: 'https://gitea.your-domain.com'
|
||||
secrets:
|
||||
GITEA_TOKEN:
|
||||
required: true
|
||||
@ -15,84 +22,40 @@ on:
|
||||
jobs:
|
||||
create-release:
|
||||
runs-on: ubuntu-latest
|
||||
environment: production
|
||||
steps:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Set up Python
|
||||
uses: actions/setup-python@v4
|
||||
with:
|
||||
python-version: '3.9'
|
||||
|
||||
- name: Install Build Dependencies
|
||||
- name: Install System Dependencies
|
||||
run: |
|
||||
echo "Current directory: $(pwd)"
|
||||
|
||||
# Systemabhängigkeiten
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y build-essential gcc git wget
|
||||
|
||||
# PlatformIO CLI installieren
|
||||
curl -fsSL https://raw.githubusercontent.com/platformio/platformio-core/master/scripts/get-platformio.py -o get-platformio.py
|
||||
python3 get-platformio.py
|
||||
|
||||
# PATH aktualisieren
|
||||
echo "$HOME/.platformio/penv/bin" >> $GITHUB_PATH
|
||||
export PATH="$HOME/.platformio/penv/bin:$PATH"
|
||||
|
||||
echo "Verifying installation:"
|
||||
pio --version
|
||||
python --version
|
||||
gcc --version
|
||||
|
||||
echo "Project contents:"
|
||||
ls -la
|
||||
sudo apt-get install -y python3 python3-venv build-essential curl git
|
||||
|
||||
- name: Prepare Build Environment
|
||||
- name: Set up Python Virtual Environment
|
||||
run: |
|
||||
# PlatformIO Core initialisieren
|
||||
pio platform install "espressif32"
|
||||
python3 -m venv venv
|
||||
source venv/bin/activate
|
||||
pip install --upgrade pip
|
||||
pip install platformio esptool
|
||||
|
||||
echo "Installing libraries..."
|
||||
pio lib install \
|
||||
"tzapu/WiFiManager @ ^2.0.17" \
|
||||
"https://github.com/me-no-dev/ESPAsyncWebServer.git" \
|
||||
"me-no-dev/AsyncTCP @ ^1.1.1" \
|
||||
"bogde/HX711 @ ^0.7.5" \
|
||||
"adafruit/Adafruit SSD1306 @ ^2.5.13" \
|
||||
"adafruit/Adafruit GFX Library @ ^1.11.11" \
|
||||
"adafruit/Adafruit PN532 @ ^1.3.3" \
|
||||
"bblanchon/ArduinoJson @ ^7.3.0" \
|
||||
"knolleary/PubSubClient @ ^2.8" \
|
||||
"digitaldragon/SSLClient @ ^1.3.2"
|
||||
|
||||
echo "Installed libraries:"
|
||||
pio lib list
|
||||
echo "Verifying installations:"
|
||||
platformio --version
|
||||
python3 --version
|
||||
esptool.py version
|
||||
|
||||
- name: Build Project
|
||||
- name: Build Firmware
|
||||
run: |
|
||||
# PlatformIO Core Variablen setzen
|
||||
export PLATFORMIO_BUILD_FLAGS="-D VERSION=\\"1.2.35\\" -DNDEBUG"
|
||||
|
||||
echo "Building project..."
|
||||
pio run -e esp32dev -v
|
||||
|
||||
source venv/bin/activate
|
||||
echo "Building SPIFFS..."
|
||||
pio run -e esp32dev -t buildfs -v
|
||||
platformio run -t buildfs
|
||||
|
||||
echo "Build output:"
|
||||
ls -la .pio/build/esp32dev/
|
||||
echo "Building firmware..."
|
||||
platformio run
|
||||
|
||||
- name: Merge Firmware Files
|
||||
- name: Create Release Files
|
||||
run: |
|
||||
pip install esptool==4.5.1
|
||||
|
||||
echo "Available files:"
|
||||
ls -la .pio/build/esp32dev/
|
||||
|
||||
source venv/bin/activate
|
||||
echo "Creating release files..."
|
||||
esptool.py --chip esp32 merge_bin \
|
||||
--flash_mode dio \
|
||||
--flash_freq 40m \
|
||||
@ -104,63 +67,50 @@ jobs:
|
||||
0x290000 .pio/build/esp32dev/spiffs.bin
|
||||
|
||||
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
|
||||
|
||||
echo "Final binaries:"
|
||||
ls -la .pio/build/esp32dev/filaman_*.bin
|
||||
|
||||
- name: Create Release
|
||||
shell: bash
|
||||
env:
|
||||
TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||
SERVER_URL: ${{ inputs.server_url }}
|
||||
GITEA_REF_NAME: ${{ inputs.gitea_ref_name }}
|
||||
GITEA_SERVER_URL: ${{ inputs.gitea_server_url }}
|
||||
GITEA_REPOSITORY: ${{ inputs.gitea_repository }}
|
||||
run: |
|
||||
# Basis-Variablen
|
||||
API_BASE="${GITEA_SERVER_URL:-${SERVER_URL}}/api/v1"
|
||||
REPO="${GITEA_REPOSITORY}"
|
||||
echo "Debug environment:"
|
||||
echo "GITEA_REF_NAME: ${GITEA_REF_NAME}"
|
||||
echo "GITEA_SERVER_URL: ${GITEA_SERVER_URL}"
|
||||
echo "GITEA_REPOSITORY: ${GITEA_REPOSITORY}"
|
||||
|
||||
TAG="${GITEA_REF_NAME}"
|
||||
API_URL="${GITEA_SERVER_URL}/api/v1"
|
||||
REPO="${GITEA_REPOSITORY}"
|
||||
|
||||
echo "Release configuration:"
|
||||
echo "API Base: $API_BASE"
|
||||
echo "Repository: $REPO"
|
||||
echo "Tag: $TAG"
|
||||
echo "Creating release for ${TAG} on ${REPO}..."
|
||||
|
||||
# Test API-Verbindung
|
||||
echo "Testing API connection..."
|
||||
curl -k -v \
|
||||
-H "Authorization: token ${TOKEN}" \
|
||||
"${API_BASE}/version"
|
||||
|
||||
# Release erstellen
|
||||
echo "Creating release..."
|
||||
RESPONSE=$(curl -k -v \
|
||||
# Create release
|
||||
RESPONSE=$(curl -k -s \
|
||||
-X POST \
|
||||
-H "Authorization: token ${TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "{\"tag_name\":\"${TAG}\",\"name\":\"Release ${TAG}\"}" \
|
||||
"${API_BASE}/repos/${REPO}/releases")
|
||||
"${API_URL}/repos/${REPO}/releases")
|
||||
|
||||
echo "Release response:"
|
||||
echo "$RESPONSE"
|
||||
|
||||
# Release ID extrahieren
|
||||
RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | cut -d':' -f2 | head -n1)
|
||||
|
||||
if [ -n "$RELEASE_ID" ]; then
|
||||
if [ -n "$RELEASE_ID"; then
|
||||
echo "Release created with ID: $RELEASE_ID"
|
||||
|
||||
# Binärdateien hochladen
|
||||
# Upload files
|
||||
for file in "filaman_full.bin" "filaman_ota.bin"; do
|
||||
echo "Uploading $file..."
|
||||
curl -k -v \
|
||||
curl -k -s \
|
||||
-X POST \
|
||||
-H "Authorization: token ${TOKEN}" \
|
||||
-H "Content-Type: application/octet-stream" \
|
||||
--data-binary "@.pio/build/esp32dev/$file" \
|
||||
"${API_BASE}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file"
|
||||
"${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file"
|
||||
done
|
||||
|
||||
echo "Upload completed"
|
||||
else
|
||||
echo "Failed to create release"
|
||||
echo "Failed to create release. Response:"
|
||||
echo "$RESPONSE"
|
||||
exit 1
|
||||
fi
|
33
.github/workflows/release.yml
vendored
33
.github/workflows/release.yml
vendored
@ -10,7 +10,9 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
outputs:
|
||||
provider: ${{ steps.provider.outputs.provider }}
|
||||
server_url: ${{ steps.provider.outputs.server_url }}
|
||||
gitea_ref_name: ${{ steps.provider.outputs.gitea_ref_name }}
|
||||
gitea_server_url: ${{ steps.provider.outputs.gitea_server_url }}
|
||||
gitea_repository: ${{ steps.provider.outputs.gitea_repository }}
|
||||
steps:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v3
|
||||
@ -28,26 +30,16 @@ jobs:
|
||||
id: provider
|
||||
shell: bash
|
||||
run: |
|
||||
# Initialize provider as unknown
|
||||
PROVIDER="unknown"
|
||||
SERVER_URL=""
|
||||
|
||||
# Check for Gitea specific environment first
|
||||
if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then
|
||||
PROVIDER="gitea"
|
||||
SERVER_URL="${GITEA_SERVER_URL}"
|
||||
# Then check for GitHub
|
||||
echo "provider=gitea" >> "$GITHUB_OUTPUT"
|
||||
echo "gitea_ref_name=${GITHUB_REF_NAME}" >> "$GITHUB_OUTPUT"
|
||||
echo "gitea_server_url=${GITHUB_SERVER_URL}" >> "$GITHUB_OUTPUT"
|
||||
echo "gitea_repository=${GITHUB_REPOSITORY}" >> "$GITHUB_OUTPUT"
|
||||
elif [ "${GITHUB_ACTIONS}" = "true" ]; then
|
||||
PROVIDER="github"
|
||||
echo "provider=github" >> "$GITHUB_OUTPUT"
|
||||
else
|
||||
echo "provider=unknown" >> "$GITHUB_OUTPUT"
|
||||
fi
|
||||
|
||||
echo "Detected provider: ${PROVIDER}"
|
||||
echo "Server URL: ${SERVER_URL}"
|
||||
|
||||
{
|
||||
echo "provider=${PROVIDER}"
|
||||
echo "server_url=${SERVER_URL}"
|
||||
} >> "$GITHUB_OUTPUT"
|
||||
|
||||
verify-provider:
|
||||
needs: route
|
||||
@ -56,7 +48,6 @@ jobs:
|
||||
- name: Echo detected provider
|
||||
run: |
|
||||
echo "Detected CI Provider: ${{ needs.route.outputs.provider }}"
|
||||
echo "Server URL: ${{ needs.route.outputs.server_url }}"
|
||||
if [ "${{ needs.route.outputs.provider }}" = "unknown" ]; then
|
||||
echo "::error::Failed to detect CI provider!"
|
||||
exit 1
|
||||
@ -72,6 +63,8 @@ jobs:
|
||||
if: needs.route.outputs.provider == 'gitea'
|
||||
uses: ./.github/workflows/providers/gitea-release.yml
|
||||
with:
|
||||
server_url: ${{ needs.route.outputs.server_url }}
|
||||
gitea_ref_name: ${{ needs.route.outputs.gitea_ref_name }}
|
||||
gitea_server_url: ${{ needs.route.outputs.gitea_server_url }}
|
||||
gitea_repository: ${{ needs.route.outputs.gitea_repository }}
|
||||
secrets:
|
||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
40
CHANGELOG.md
40
CHANGELOG.md
@ -1,5 +1,45 @@
|
||||
# Changelog
|
||||
|
||||
## [1.2.44] - 2025-02-19
|
||||
### Added
|
||||
- update Gitea release workflow to include additional outputs and increment version to 1.2.44
|
||||
|
||||
|
||||
## [1.2.43] - 2025-02-19
|
||||
### Added
|
||||
- update Gitea release workflow by removing unnecessary outputs and increment version to 1.2.43
|
||||
|
||||
|
||||
## [1.2.42] - 2025-02-19
|
||||
### Added
|
||||
- update Gitea release workflow to include additional outputs and increment version to 1.2.42
|
||||
|
||||
|
||||
## [1.2.41] - 2025-02-19
|
||||
### Added
|
||||
- update Gitea release workflow debug output and increment version to 1.2.41
|
||||
|
||||
|
||||
## [1.2.40] - 2025-02-19
|
||||
### Added
|
||||
- add inputs for Gitea release workflow and increment version to 1.2.40
|
||||
|
||||
|
||||
## [1.2.39] - 2025-02-19
|
||||
### Added
|
||||
- update Gitea release workflow to use Python virtual environment and increment version to 1.2.39
|
||||
|
||||
|
||||
## [1.2.38] - 2025-02-19
|
||||
### Added
|
||||
- update Gitea release workflow and increment version to 1.2.38
|
||||
|
||||
|
||||
## [1.2.37] - 2025-02-19
|
||||
### Added
|
||||
- update Gitea release workflow and increment version to 1.2.37
|
||||
|
||||
|
||||
## [1.2.36] - 2025-02-19
|
||||
### Added
|
||||
- update Gitea release workflow and increment version to 1.2.36
|
||||
|
@ -9,7 +9,7 @@
|
||||
; https://docs.platformio.org/page/projectconf.html
|
||||
|
||||
[common]
|
||||
version = "1.2.36"
|
||||
version = "1.2.44"
|
||||
|
||||
[env:esp32dev]
|
||||
platform = espressif32
|
||||
|
Reference in New Issue
Block a user