.github/workflows/providers/gitea-release.yml

@@ -2,98 +2,61 @@ name: Gitea Release
 
 on:
   workflow_call:
-    inputs:
-      server_url:
-        description: 'Gitea server URL'
-        required: false
-        type: string
-        default: 'https://gitea.your-domain.com'
-    secrets:
-      GITEA_TOKEN:
-        required: true
 
 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
       run: |
-        echo "Current directory: $(pwd)"
+        # System-Level Dependencies
-        
+        echo "Installing system dependencies..."
-        # Systemabhängigkeiten
         sudo apt-get update
-        sudo apt-get install -y build-essential gcc git wget
+        sudo apt-get install -y python3-minimal python3-pip curl
 
-        # PlatformIO CLI installieren
+        # Verify Python installation
-        curl -fsSL https://raw.githubusercontent.com/platformio/platformio-core/master/scripts/get-platformio.py -o get-platformio.py
+        echo "Python version:"
-        python3 get-platformio.py
+        python3 --version
         
-        # PATH aktualisieren
+        # Verify pip installation
-        echo "$HOME/.platformio/penv/bin" >> $GITHUB_PATH
+        echo "Pip version:"
-        export PATH="$HOME/.platformio/penv/bin:$PATH"
+        pip3 --version
         
-        echo "Verifying installation:"
+        # Install Python packages
-        pio --version
+        echo "Installing Python packages..."
-        python --version
+        python3 -m pip install --user platformio
-        gcc --version
+        python3 -m pip install --user esptool
         
-        echo "Project contents:"
+        # Add local bin to PATH
-        ls -la
+        echo "${HOME}/.local/bin" >> $GITHUB_PATH
+        export PATH="${HOME}/.local/bin:$PATH"
         
-    - name: Prepare Build Environment
+        # Verify installations
+        echo "PlatformIO version:"
+        pio --version || echo "PlatformIO not found in PATH"
+        
+        echo "Esptool version:"
+        esptool.py version || echo "Esptool not found in PATH"
+
+    - name: Build Firmware
       run: |
-        # PlatformIO Core initialisieren
+        # Ensure PlatformIO is in PATH
-        pio platform install "espressif32"
+        export PATH="${HOME}/.local/bin:$PATH"
-        
-        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
-
-    - name: Build Project
-      run: |
-        # PlatformIO Core Variablen setzen
-        export PLATFORMIO_BUILD_FLAGS="-D VERSION=\\"1.2.35\\" -DNDEBUG"
-        
-        echo "Building project..."
-        pio run -e esp32dev -v
         
         echo "Building SPIFFS..."
-        pio run -e esp32dev -t buildfs -v
+        python3 -m platformio run -t buildfs
         
-        echo "Build output:"
+        echo "Building firmware..."
-        ls -la .pio/build/esp32dev/
+        python3 -m platformio run
 
     - name: Merge Firmware Files
       run: |
-        pip install esptool==4.5.1
+        export PATH="${HOME}/.local/bin:$PATH"
         
-        echo "Available files:"
+        python3 -m esptool --chip esp32 merge_bin \
-        ls -la .pio/build/esp32dev/
-        
-        esptool.py --chip esp32 merge_bin \
           --flash_mode dio \
           --flash_freq 40m \
           --flash_size 4MB \
@@ -105,45 +68,29 @@ jobs:
         
         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 }}
+        GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
-        SERVER_URL: ${{ inputs.server_url }}
       run: |
-        # Basis-Variablen
+        # Basis-Variablen setzen
-        API_BASE="${GITEA_SERVER_URL:-${SERVER_URL}}/api/v1"
+        API_BASE="${GITEA_SERVER_URL}/api/v1"
         REPO="${GITEA_REPOSITORY}"
         TAG="${GITEA_REF_NAME}"
         
-        echo "Release configuration:"
+        echo "Creating release for ${TAG}..."
-        echo "API Base: $API_BASE"
-        echo "Repository: $REPO"
-        echo "Tag: $TAG"
-        
-        # 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 -f -s \
-        RESPONSE=$(curl -k -v \
           -X POST \
-          -H "Authorization: token ${TOKEN}" \
+          -H "accept: application/json" \
+          -H "Authorization: token ${GITEA_TOKEN}" \
           -H "Content-Type: application/json" \
           -d "{\"tag_name\":\"${TAG}\",\"name\":\"Release ${TAG}\"}" \
           "${API_BASE}/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)
+        RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | cut -d':' -f2)
         
         if [ -n "$RELEASE_ID" ]; then
           echo "Release created with ID: $RELEASE_ID"
@@ -151,9 +98,9 @@ jobs:
           # Binärdateien hochladen
           for file in "filaman_full.bin" "filaman_ota.bin"; do
             echo "Uploading $file..."
-            curl -k -v \
+            curl -k -f -s \
               -X POST \
-              -H "Authorization: token ${TOKEN}" \
+              -H "Authorization: token ${GITEA_TOKEN}" \
               -H "Content-Type: application/octet-stream" \
               --data-binary "@.pio/build/esp32dev/$file" \
               "${API_BASE}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file"
@@ -162,5 +109,6 @@ jobs:
           echo "Upload completed"
         else
           echo "Failed to create release"
+          echo "$RESPONSE"
           exit 1
         fi

.github/workflows/release.yml

@@ -10,7 +10,6 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       provider: ${{ steps.provider.outputs.provider }}
-      server_url: ${{ steps.provider.outputs.server_url }}
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3
@@ -21,7 +20,6 @@ jobs:
           echo "GITHUB_ACTIONS=${GITHUB_ACTIONS:-not set}"
           echo "GITEA_ACTIONS=${GITEA_ACTIONS:-not set}"
           echo "GITEA_REPOSITORY=${GITEA_REPOSITORY:-not set}"
-          echo "GITEA_SERVER_URL=${GITEA_SERVER_URL:-not set}"
           echo "RUNNER_NAME=${RUNNER_NAME:-not set}"
 
       - name: Determine CI Provider
@@ -30,24 +28,17 @@ jobs:
         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
           elif [ "${GITHUB_ACTIONS}" = "true" ]; then
             PROVIDER="github"
           fi
           
           echo "Detected provider: ${PROVIDER}"
-          echo "Server URL: ${SERVER_URL}"
+          echo "provider=${PROVIDER}" >> "${GITHUB_OUTPUT}"
-          
-          {
-            echo "provider=${PROVIDER}"
-            echo "server_url=${SERVER_URL}"
-          } >> "$GITHUB_OUTPUT"
 
   verify-provider:
     needs: route
@@ -56,7 +47,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
@@ -71,7 +61,3 @@ jobs:
     needs: [route, verify-provider]
     if: needs.route.outputs.provider == 'gitea'
     uses: ./.github/workflows/providers/gitea-release.yml
-    with:
-      server_url: ${{ needs.route.outputs.server_url }}
-    secrets:
-      GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}

CHANGELOG.md

@@ -1,10 +1,5 @@
 # Changelog
 
-## [1.2.36] - 2025-02-19
-### Added
-- update Gitea release workflow and increment version to 1.2.36
-
-
 ## [1.2.35] - 2025-02-19
 ### Added
 - update Gitea release workflow and version to 1.2.35

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [common]
-version = "1.2.36"
+version = "1.2.35"
 
 [env:esp32dev]
 platform = espressif32