changelog in release.yml aufgenommen

.gitea/workflows/release.yml

@@ -1,4 +1,3 @@
-# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
 name: Release Plugin
 
 on:
@@ -24,11 +23,9 @@ jobs:
         run: |
           # Tag aus GitHub Actions Kontext extrahieren
           TAG="${GITHUB_REF#refs/tags/}"
-          echo "DEBUG | Tag erkannt: $TAG"
 
           # Repo-URL dynamisch aus vars und github.repository bauen
           REPO_URL="https://${RELEASE_TOKEN}:x-oauth-basic@${{ vars.RELEASE_URL }}/${GITHUB_REPOSITORY}.git"
-          echo "DEBUG |  Klone von: $REPO_URL"
 
           # Repository klonen
           git clone "$REPO_URL" repo
@@ -53,43 +50,77 @@ jobs:
           echo "version=${VERSION}" >> $GITHUB_OUTPUT
           echo "channel=${CHANNEL}" >> $GITHUB_OUTPUT
 
-          echo "DEBUG | Version: $VERSION"
+      - name: plugin.info einlesen
-          echo "DEBUG | Kanal: $CHANNEL"
+        id: info
+        run: |
+          cd repo
+          while IFS='=' read -r key value; do
+            echo "$key=$value" >> $GITHUB_OUTPUT
+          done < plugin.info
+
+      - name: Changelog einlesen
+        id: changelog
+          run: |
+            cd repo
+
+            # Aktueller Block = alles vor dem ersten ---
+            CURRENT=$(sed '/^---/Q' changelog.txt)
+
+            # Vollständige Historie für Gitea Release Body
+            # Aktuelle Version aus Tag voranstellen
+            VERSION="${{ steps.releaseinfo.outputs.version }}"
+            FULL=$(printf "## %s\n%s\n\n%s" \
+              "$VERSION" \
+              "$CURRENT" \
+              "$(sed '1,/^---/d' changelog.txt)")
+
+            # Für GITHUB_OUTPUT: Newlines escapen
+            echo "current<<EOF" >> $GITHUB_OUTPUT
+            echo "$CURRENT"     >> $GITHUB_OUTPUT
+            echo "EOF"          >> $GITHUB_OUTPUT
+
+            echo "full<<EOF"    >> $GITHUB_OUTPUT
+            echo "$FULL"        >> $GITHUB_OUTPUT
+            echo "EOF"          >> $GITHUB_OUTPUT
 
       - name: metadata.txt erzeugen
         run: |
           cd repo
 
-          VERSION="${{ steps.releaseinfo.outputs.version }}"
+          TEMPLATE="templates/metadata.template"
+          OUT="metadata.txt"
 
-          # Vorlage kopieren
+          CONTENT=$(cat "$TEMPLATE")
-          cp .plugin/metadata.template metadata.txt
 
-          # Platzhalter ersetzen
+          CONTENT="${CONTENT//\{\{NAME\}\}/${{ steps.info.outputs.name }}}"
-          sed -i "s/@VERSION@/${VERSION}/g" metadata.txt
+          CONTENT="${CONTENT//\{\{QGIS_MIN\}\}/${{ steps.info.outputs.qgisMinimumVersion }}}"
+          CONTENT="${CONTENT//\{\{QGIS_MAX\}\}/${{ steps.info.outputs.qgisMaximumVersion }}}"
+          CONTENT="${CONTENT//\{\{DESCRIPTION\}\}/${{ steps.info.outputs.description }}}"
+          CONTENT="${CONTENT//\{\{VERSION\}\}/${{ steps.releaseinfo.outputs.version }}}"
+          CONTENT="${CONTENT//\{\{AUTHOR\}\}/${{ steps.info.outputs.author }}}"
+          CONTENT="${CONTENT//\{\{EMAIL\}\}/${{ steps.info.outputs.email }}}"
+          CONTENT="${CONTENT//\{\{HOMEPAGE\}\}/${{ vars.RELEASE_URL }}/${GITHUB_REPOSITORY}}"
+          CONTENT="${CONTENT//\{\{TRACKER\}\}/${{ vars.RELEASE_URL }}/${GITHUB_REPOSITORY}}"
+          CONTENT="${CONTENT//\{\{REPOSITORY\}\}/${{ vars.RELEASE_URL }}/${GITHUB_REPOSITORY}}"
+          CONTENT="${CONTENT//\{\{EXPERIMENTAL\}\}/${{ steps.info.outputs.experimental }}}"
+          CONTENT="${CONTENT//\{\{DEPRECATED\}\}/${{ steps.info.outputs.deprecated }}}"
+          CONTENT="${CONTENT//\{\{QT6\}\}/${{ steps.info.outputs.supportsQt6 }}}"
 
-          echo "DEBUG | metadata.txt erzeugt:"
+          printf "%s\n" "$CONTENT" > "$OUT"
-          cat metadata.txt
 
       - name: ZIP-Datei erstellen
         id: zip
         run: |
           cd repo
 
-          # Plugin-Ordnername aus .plugin/zip_folder lesen
+          ZIP_FOLDER="${{ steps.info.outputs.zip_folder }}"
-          ZIP_FOLDER=$(cat .plugin/zip_folder)
-          echo "DEBUG | Plugin-Ordnername: $ZIP_FOLDER"
 
           VERSION="${{ steps.releaseinfo.outputs.version }}"
           REPO_NAME="${GITHUB_REPOSITORY##*/}"
           ZIP_NAME="${REPO_NAME}-${VERSION}.zip"
 
-          echo "DEBUG | ZIP wird erzeugt: $ZIP_NAME"
-
-          # Temporären Build-Ordner anlegen
           mkdir -p dist/${ZIP_FOLDER}
 
-          # Plugin-Dateien kopieren (alles außer CI-/Meta-Verzeichnisse)
           rsync -a \
             --exclude='.git' \
             --exclude='.gitea' \
@@ -97,200 +128,127 @@ jobs:
             --exclude='dist' \
             ./ dist/${ZIP_FOLDER}/
 
-          # ZIP erzeugen
           cd dist
           zip -r "${ZIP_NAME}" "${ZIP_FOLDER}/" \
             -x "*.pyc" -x "*/__pycache__/*"
           cd ..
 
-          # ZIP-Name für spätere Steps bereitstellen
           echo "zip_name=${ZIP_NAME}" >> $GITHUB_OUTPUT
 
-          echo "DEBUG | ZIP-Datei erzeugt: dist/${ZIP_NAME}"
+      - name: Gitea‑Release erstellen
-
+        id: create_release
-
-
-      - name: Debug Info
         run: |
-          echo "Tag: $GITEA_REF_NAME"
+          TAG="${{ github.ref_name }}"
-          uname -a
+          VERSION="${{ steps.releaseinfo.outputs.version }}"
+          CHANNEL="${{ steps.releaseinfo.outputs.channel }}"
 
-      # - name: Read plugin.cfg
+          API_URL="https://${{ vars.RELEASE_URL }}/api/v1/repos/${GITHUB_REPOSITORY}/releases"
-      #   id: cfg
-      #   run: |
-      #     CFG=".plugin/plugin.cfg"
 
-      #     get_value() {
+          JSON=$(jq -n \
-      #       grep -i "^$1" "$CFG" | head -1 | cut -d= -f2- | tr -d '\r' | xargs
+            --arg tag   "$TAG" \
-      #     }
+            --arg name  "Version $VERSION" \
+            --arg body  "${{ steps.changelog.outputs.full }}" \
+            '{tag_name: $tag, name: $name, body: $body, draft: false, prerelease: false}')
 
-      #     echo "zip_folder=$(get_value zip_folder)"          >> $GITHUB_OUTPUT
+          API_RESPONSE=$(curl -s -X POST "$API_URL" \
-      #     echo "name=$(get_value name)"                      >> $GITHUB_OUTPUT
+            -H "accept: application/json" \
-      #     echo "qgis_min=$(get_value qgisMinimumVersion)"    >> $GITHUB_OUTPUT
+            -H "Authorization: token ${{ secrets.RELEASE_TOKEN }}" \
-      #     echo "qgis_max=$(get_value qgisMaximumVersion)"    >> $GITHUB_OUTPUT
+            -H "Content-Type: application/json" \
-      #     echo "description=$(get_value description)"        >> $GITHUB_OUTPUT
+            -d "$JSON")
-      #     echo "author=$(get_value author)"                  >> $GITHUB_OUTPUT
-      #     echo "email=$(get_value email)"                    >> $GITHUB_OUTPUT
-      #     echo "homepage=$(get_value homepage)"              >> $GITHUB_OUTPUT
-      #     echo "tracker=$(get_value tracker)"                >> $GITHUB_OUTPUT
-      #     echo "repository=$(get_value repository)"          >> $GITHUB_OUTPUT
-      #     echo "experimental=$(get_value experimental)"      >> $GITHUB_OUTPUT
-      #     echo "deprecated=$(get_value deprecated)"          >> $GITHUB_OUTPUT
 
-      #     # Nur fürs Log:
+          RELEASE_ID=$(echo "$API_RESPONSE" | jq -r '.id')
-      #     echo "zip_folder=$(get_value zip_folder)" 
-      #     echo "name=$(get_value name)"
-      #     echo "qgis_min=$(get_value qgisMinimumVersion)"
-      #     echo "qgis_max=$(get_value qgisMaximumVersion)"
-      #     echo "description=$(get_value description)"
-      #     echo "author=$(get_value author)"
-      #     echo "email=$(get_value email)"
-      #     echo "homepage=$(get_value homepage)"
-      #     echo "tracker=$(get_value tracker)"
-      #     echo "repository=$(get_value repository)"
-      #     echo "experimental=$(get_value experimental)"
-      #     echo "deprecated=$(get_value deprecated)"
 
-      # - name: Generate metadata.txt
+            if [ "$RELEASE_ID" = "null" ] || [ -z "$RELEASE_ID" ]; then
-      #   run: |
+              echo "Fehler beim Erstellen des Releases!"
-      #     VERSION="${{ steps.info.outputs.version }}"
+              echo "$API_RESPONSE"
-      #     CHANGELOG=$(cat .plugin/changelog.txt)
+              exit 1
+            fi
 
-      #     cat > metadata.txt << EOF
+            echo "release_id=$RELEASE_ID" >> $GITHUB_OUTPUT
-      #     [general]
-      #     name=${{ steps.cfg.outputs.name }}
-      #     version=${VERSION}
-      #     qgisMinimumVersion=${{ steps.cfg.outputs.qgis_min }}
-      #     qgisMaximumVersion=${{ steps.cfg.outputs.qgis_max }}
-      #     description=${{ steps.cfg.outputs.description }}
-      #     author=${{ steps.cfg.outputs.author }}
-      #     email=${{ steps.cfg.outputs.email }}
-      #     homepage=${{ steps.cfg.outputs.homepage }}
-      #     tracker=${{ steps.cfg.outputs.tracker }}
-      #     repository=${{ steps.cfg.outputs.repository }}
-      #     experimental=${{ steps.cfg.outputs.experimental }}
-      #     deprecated=${{ steps.cfg.outputs.deprecated }}
-      #     changelog=${VERSION}
-      #     $(cat .plugin/changelog.txt)
-      #     EOF
 
-      #     # Nur fürs Log:
+      - name: ZIP-Datei hochladen
-      #     cat metadata.txt
+        run: |
+          RELEASE_ID="${{ steps.create_release.outputs.release_id }}"
+          ZIP_NAME="${{ steps.zip.outputs.zip_name }}"
 
-      # - name: Build plugin ZIP
+          API_URL="https://${{ vars.RELEASE_URL }}/api/v1/repos/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}/assets?name=${ZIP_NAME}"
-      #   run: |
-      #     REPO_NAME="${{ github.event.repository.name }}"
-      #     ZIP_FOLDER="${{ steps.cfg.outputs.zip_folder }}"
-      #     VERSION="${{ steps.info.outputs.version }}"
-      #     ZIP_NAME="${REPO_NAME}-${VERSION}.zip"
 
-      #     # Temporären Ordner mit zip_folder-Namen anlegen
+          curl -s -X POST "$API_URL" \
-      #     mkdir -p dist/${ZIP_FOLDER}
+            -H "Authorization: token ${{ secrets.RELEASE_TOKEN }}" \
+            -H "Content-Type: application/zip" \
+            --data-binary "@repo/dist/${ZIP_NAME}" \
+            -o upload_response.json
 
-      #     # Alle Plugin-Dateien hineinkopieren (ohne .gitea, .plugin, dist)
+          # Optional: Fehlerprüfung
-      #     rsync -a \
+          if jq -e '.id' upload_response.json >/dev/null 2>&1; then
-      #       --exclude='.gitea' \
+            echo "ZIP erfolgreich hochgeladen."
-      #       --exclude='.plugin' \
+          else
-      #       --exclude='.git' \
+            echo "Fehler beim Hochladen der ZIP!"
-      #       --exclude='dist' \
+            exit 1
-      #       ./ dist/${ZIP_FOLDER}/
+          fi
 
-      #     # ZIP bauen
+      - name: Payload erzeugen
-      #     cd dist
+        run: |
-      #     zip -r ${ZIP_NAME} ${ZIP_FOLDER}/ \
+          cd repo
-      #       -x "*.pyc" -x "*/__pycache__/*"
-      #     cd ..
 
-      #     echo "ZIP_NAME=${ZIP_NAME}" >> $GITHUB_ENV
+          VERSION="${{ steps.releaseinfo.outputs.version }}"
+          CHANNEL="${{ steps.releaseinfo.outputs.channel }}"
+          ZIP_NAME="${{ steps.zip.outputs.zip_name }}"
 
-      #     # Nur fürs Log:
+          DOWNLOAD_URL="https://${{ vars.RELEASE_URL }}/${GITHUB_REPOSITORY}/releases/download/${{ github.ref_name }}/${ZIP_NAME}"
-      #     echo "ZIP_NAME=${ZIP_NAME}"
 
-      # - name: Create Gitea Release
+          jq -n \
-      #   id: create_release
+            --arg name         "${{ steps.info.outputs.name }}" \
-      #   run: |
+            --arg version      "$VERSION" \
-      #     echo "Kommuniziere mit Gitea API über HTTPS..."
+            --arg channel      "$CHANNEL" \
-      #     API_RESPONSE=$(curl -s -k -X POST "https://${{ vars.RELEASE_URL }}/api/v1/repos/${{ github.repository }}/releases" \
+            --arg description  "${{ steps.info.outputs.description }}" \
-      #       -H "accept: application/json" \
+            --arg author       "${{ steps.info.outputs.author }}" \
-      #       -H "Authorization: token ${{ secrets.RELEASE_TOKEN }}" \
+            --arg email        "${{ steps.info.outputs.email }}" \
-      #       -H "Content-Type: application/json" \
+            --arg qgis_min     "${{ steps.info.outputs.qgisMinimumVersion }}" \
-      #       -d '{
+            --arg qgis_max     "${{ steps.info.outputs.qgisMaximumVersion }}" \
-      #         "body": "Dieses Release wurde automatisch vom Gitea Runner erstellt.",
+            --arg homepage     "${{ vars.RELEASE_URL }}/${GITHUB_REPOSITORY}" \
-      #         "draft": false,
+            --arg tracker      "${{ vars.RELEASE_URL }}/${GITHUB_REPOSITORY}" \
-      #         "name": "Version ${{ github.ref_name }}",
+            --arg repository   "${{ vars.RELEASE_URL }}/${GITHUB_REPOSITORY}" \
-      #         "prerelease": false,
+            --arg experimental "${{ steps.info.outputs.experimental }}" \
-      #         "tag_name": "${{ github.ref_name }}"
+            --arg deprecated   "${{ steps.info.outputs.deprecated }}" \
-      #       }')
+            --arg qt6          "${{ steps.info.outputs.supportsQt6 }}" \
+            --arg id           "${{ steps.info.outputs.zip_folder }}" \
+            --arg url          "$DOWNLOAD_URL" \
+            --arg changelog    "${{ steps.changelog.outputs.current }}" \
+            '{
+              name:         $name,
+              version:      $version,
+              channel:      $channel,
+              description:  $description,
+              author:       $author,
+              email:        $email,
+              qgis_min:     $qgis_min,
+              qgis_max:     $qgis_max,
+              homepage:     $homepage,
+              tracker:      $tracker,
+              repository:   $repository,
+              experimental: $experimental,
+              deprecated:   $deprecated,
+              qt6:          $qt6,
+              id:           $id,
+              url:          $url,
+              changelog:    $changelog
+            }' > payload.json
 
-      #     RELEASE_ID=$(echo $API_RESPONSE | jq -r '.id')
+      - name: Repository aktualisieren
+        run: |
+          OWNER="AG_QGIS"
+          WORKFLOW="update.yml"
 
-      #     if [ "$RELEASE_ID" = "null" ] || [ -z "$RELEASE_ID" ]; then
+          PAYLOAD_B64=$(base64 -w0 repo/payload.json)
-      #       echo "Fehler beim Erstellen des Releases. API Antwort:"
-      #       echo $API_RESPONSE
-      #       exit 1
-      #     fi
 
-      #     echo "Release ID: $RELEASE_ID"
+          JSON="{\"ref\":\"feature/release\",\"inputs\":{\"payload\":\"$PAYLOAD_B64\"}}"
-      #     echo "RELEASE_ID=$RELEASE_ID" >> $GITHUB_ENV
 
-      # - name: Upload ZIP asset
+          echo "DEBUG | Sende JSON:"
-      #   id: upload_asset
+          echo "$JSON"
-      #   run: |
-      #     echo "Lade release_${{ github.ref_name }}.zip (${{ env.ZIP_NAME }}) hoch..."
 
-      #     RESPONSE=$(curl -s -k -X POST \
+          curl -X POST \
-      #       "https://${{ vars.RELEASE_URL }}/api/v1/repos/${{ github.repository }}/releases/${{ env.RELEASE_ID }}/assets?name=${{ env.ZIP_NAME }}" \
+            -H "Authorization: token ${{ secrets.RELEASE_TOKEN }}" \
-      #       -H "accept: application/json" \
+            -H "Content-Type: application/json" \
-      #       -H "Authorization: token ${{ secrets.RELEASE_TOKEN }}" \
+            -d "$JSON" \
-      #       -H "Content-Type: multipart/form-data" \
+            "https://${{ vars.RELEASE_URL }}/api/v1/repos/${OWNER}/Repository/actions/workflows/${WORKFLOW}/dispatches"
-      #       -F "attachment=@dist/${{ env.ZIP_NAME }}")
-
-      #     echo "Upload response: $RESPONSE"
-
-      #     DOWNLOAD_URL=$(echo "$RESPONSE" | grep -o '"browser_download_url":"[^"]*' | cut -d'"' -f4)
-      #     echo "download_url=${DOWNLOAD_URL}" >> $GITHUB_OUTPUT
-
-      # - name: Build XML block
-      #   id: xmlblock
-      #   run: |
-      #     NAME="${{ steps.cfg.outputs.name }}"
-      #     VERSION="${{ steps.info.outputs.version }}"
-
-      #     BLOCK=$(cat <<EOF
-      #     <pyqgis_plugin name="${NAME}" version="${VERSION}">
-      #       <description>${{ steps.cfg.outputs.description }}</description>
-      #       <qgisMinimumVersion>${{ steps.cfg.outputs.qgis_min }}</qgisMinimumVersion>
-      #       <qgisMaximumVersion>${{ steps.cfg.outputs.qgis_max }}</qgisMaximumVersion>
-      #       <author>${{ steps.cfg.outputs.author }}</author>
-      #       <email>${{ steps.cfg.outputs.email }}</email>
-      #       <homepage>${{ steps.cfg.outputs.homepage }}</homepage>
-      #       <tracker>${{ steps.cfg.outputs.tracker }}</tracker>
-      #       <repository>${{ steps.cfg.outputs.repository }}</repository>
-      #       <download_url>${{ steps.upload_asset.outputs.download_url }}</download_url>
-      #       <experimental>${{ steps.cfg.outputs.experimental }}</experimental>
-      #       <deprecated>${{ steps.cfg.outputs.deprecated }}</deprecated>
-      #     </pyqgis_plugin>
-      #     EOF
-      #     )
-
-      #     {
-      #       echo "block<<EOF"
-      #       echo "$BLOCK"
-      #       echo "EOF"
-      #     } >> "$GITHUB_OUTPUT"
-
-      # - name: Dispatch to Repository
-      #   shell: bash
-      #   run: |
-      #     curl -s -X POST \
-      #       -H "Authorization: token ${{ secrets.RELEASE_TOKEN }}" \
-      #       -H "Content-Type: application/json" \
-      #       "https://${{ vars.RELEASE_URL }}/api/v1/repos/${{ github.repository_owner }}/Repository/dispatches" \
-      #       -d "{
-      #         \"type\": \"plugin-released\",
-      #         \"payload\": {
-      #           \"plugin\": \"${{ steps.cfg.outputs.name }}\",
-      #           \"channel\": \"${{ steps.info.outputs.channel }}\",
-      #           \"xml_block\": \"${{ steps.xmlblock.outputs.block }}\"
-      #         }
-      #       }"

.gitignore

@@ -175,3 +175,4 @@ cython_debug/
 .pypirc
 
 metadata.txt
+release.cmd

.plugin/metadata.template

@@ -1,13 +0,0 @@
-[general]
-name=LNO Sachsen | Plugin Test Action
-qgisMinimumVersion=3.0
-qgisMaximumVersion=3.99
-description=Test plugin for release pipeline
-version=@VERSION@
-author=Daniel Helbig, Michael Otto
-email=daniel.helbig@kreis-meissen.de, michael.otto@landkreis-mittelsachsen.de
-homepage=https://entwicklung.flurneuordnung-sachsen.de/AG_QGIS/Plugin_Test_Action
-tracker=https://entwicklung.flurneuordnung-sachsen.de/AG_QGIS/Plugin_Test_Action/issues
-repository=https://entwicklung.flurneuordnung-sachsen.de/AG_QGIS/Plugin_Test_Action
-experimental=True
-deprecated=False

.plugin/plugin.cfg

@@ -1,14 +0,0 @@
-[general]
-zip_folder=mein_plugin_ordner
-name=LNO Sachsen | Plugin Test Action
-qgisMinimumVersion=3.0
-qgisMaximumVersion=3.99
-description=Test plugin for release pipeline
-version=26.3.1
-author=Michael Otto
-email=michael.otto@landkreis-mittelsachsen.de
-homepage=https://entwicklung.flurneuordnung-sachsen.de/AG_QGIS/Plugin_Test_Action
-tracker=https://entwicklung.flurneuordnung-sachsen.de/AG_QGIS/Plugin_Test_Action/issues
-repository=https://entwicklung.flurneuordnung-sachsen.de/AG_QGIS/Plugin_Test_Action
-experimental=False
-deprecated=False

changelog.txt

@@ -1,4 +1,3 @@
-0.2.0
   - Feature XY hinzugefügt
   - Bug Z behoben
 0.1.0

plugin.info

@@ -0,0 +1,11 @@
+name=LNO Sachsen | Plugin Test Action
+description=Test plugin for release pipeline
+author=Daniel Helbig, Michael Otto
+email=daniel.helbig@kreis-meissen.de, michael.otto@landkreis-mittelsachsen.de
+qgisMinimumVersion=3.0
+qgisMaximumVersion=3.99
+deprecated=False
+experimental=True
+supportsQt6=Yes
+
+zip_folder=plugin_folder

templates/metadata.template

@@ -0,0 +1,14 @@
+[general]
+name={{NAME}}
+qgisMinimumVersion={{QGIS_MIN}}
+qgisMaximumVersion={{QGIS_MAX}}
+description={{DESCRIPTION}}
+version={{VERSION}}
+author={{AUTHOR}}
+email={{EMAIL}}
+homepage=https://{{HOMEPAGE}}
+tracker=https://{{TRACKER}}/issues
+repository=https://{{REPOSITORY}}
+experimental={{EXPERIMENTAL}}
+deprecated={{DEPRECATED}}
+supportsQt6={{QT6}}