Release 11-unstable

.gitea/workflows/release.yaml

@@ -19,54 +19,54 @@ jobs:
         run: |
           apk add --no-cache bash git jq curl
 
+      - name: Code holen
+        run: |
+          REPO_URL="https://${RELEASE_TOKEN}:x-oauth-basic@${{ vars.RELEASE_URL }}/${GITHUB_REPOSITORY}.git"
+
+          git clone "$REPO_URL" repo
+          cd repo
+
+          git checkout "$TAG"
+        env:
+          RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+          TAG: "${{ github.ref_name }}"
+
       - name: Version und Kanal bestimmen
         id: releaseinfo
         run: |
           TAG="${{ github.ref_name }}"
           RAW_VERSION="${TAG#v}"
-          BASE_VERSION="${RAW_VERSION%%-*}"
+          VERSION="${RAW_VERSION%%-*}" 
 
-          # Volles Repo auschecken, damit wir Branch-Info haben
+          # Channel und Suffix automatisch bestimmen anhand des Tag-Suffix
-          REPO_URL="https://${RELEASE_TOKEN}:x-oauth-basic@${{ vars.RELEASE_URL }}/${GITHUB_REPOSITORY}.git"
+          case "$RAW_VERSION" in
-          git clone "$REPO_URL" repo
+            *-testing*|*-t|*-T)
-          cd repo
-
-          # Branch ermitteln, auf dem der Tag liegt
-          BRANCH=$(git branch -r --contains "$TAG" | grep -v 'HEAD' | head -n1 | sed 's|origin/||')
-
-          # Channel und Suffix automatisch bestimmen
-          case "$BRANCH" in
-            main)
-              CHANNEL="stable"
-              PRERELEASE="false"
-              SUFFIX=""
-              ;;
-            testing)
               CHANNEL="testing"
               PRERELEASE="true"
               SUFFIX="-testing"
               ;;
-            unstable)
+            *-unstable*|*-u|*-U)
               CHANNEL="unstable"
               PRERELEASE="true"
               SUFFIX="-unstable"
               ;;
             *)
-              # unbekannter Branch -> default unstable
+              CHANNEL="stable"
-              CHANNEL="unstable"
+              PRERELEASE="false"
-              PRERELEASE="true"
+              SUFFIX=""
-              SUFFIX="-unstable"
               ;;
           esac
 
-          # Version zusammensetzen
-          VERSION="${BASE_VERSION}${SUFFIX}"
-
           # Output setzen
           echo "version=$VERSION"       >> $GITHUB_OUTPUT
           echo "channel=$CHANNEL"       >> $GITHUB_OUTPUT
           echo "prerelease=$PRERELEASE" >> $GITHUB_OUTPUT
 
+          # Optional Debug
+          echo "VERSION=$VERSION"
+          echo "CHANNEL=$CHANNEL"
+          echo "PRERELEASE=$PRERELEASE"
+
       # - name: plugin.cfg einlesen
       #   id: config
       #   run: |
@@ -78,6 +78,7 @@ jobs:
       #     done < plugin.cfg
 
       - name: Payload erzeugen
+        id: payload
         run: |
           cd repo
 
@@ -88,7 +89,8 @@ jobs:
           PRERELEASE="${{ steps.releaseinfo.outputs.prerelease }}"
           ZIP_FOLDER="${{ vars.ZIP_FOLDER }}"
           ZIP_FILE="${ZIP_FOLDER}.zip"
-          GIT_URL=${GITHUB_REPOSITORY}
+          TAG="${{ github.ref_name }}"
+          #GIT_URL=${GITHUB_REPOSITORY}
 
           jq -n \
             --arg name         "$NAME" \
@@ -98,7 +100,7 @@ jobs:
             --arg prerelease   "$PRERELEASE" \
             --arg zip_folder   "$ZIP_FOLDER" \
             --arg zip_file     "$ZIP_FILE" \
-            --arg git_url      "$GIT_URL" \
+            --arg tag           "$TAG" \
             '{
               name:         $name,
               group:        $group,
@@ -107,25 +109,25 @@ jobs:
               prerelease:   ($prerelease == "true"),
               zip_folder:   $zip_folder,
               zip_file:     $zip_file,
-              git_url:      $git_url
+              tag:          $tag
             }' > payload.json
 
             cat payload.json
 
       - name: Repository aktualisieren
         run: |
-          OWNER="AG_QGIS"
+          NAME="${GITHUB_REPOSITORY##*/}"
-          WORKFLOW="release.yaml"
+          TAG="${{ steps.releaseinfo.outputs.version }}"-"${{ steps.releaseinfo.outputs.channel }}"
-
           PAYLOAD_B64=$(base64 -w0 repo/payload.json)
 
-          FULL_NAME="${{ steps.metadata.outputs.name }}"
-          NAME=$(echo "$FULL_NAME" | awk -F'|' '{gsub(/^ +| +$/,"",$2); print $2}')
-          TAG="${{ steps.releaseinfo.outputs.version }}"
-
           JSON="{\"ref\":\"hidden/workflows\",\"inputs\":{\"payload\":\"$PAYLOAD_B64\",\"name\":\"$NAME\",\"tag\":\"$TAG\"}}"
           curl -X POST \
             -H "Authorization: token ${{ secrets.RELEASE_TOKEN }}" \
             -H "Content-Type: application/json" \
             -d "$JSON" \
             "https://${{ vars.RELEASE_URL }}/api/v1/repos/${OWNER}/Repository/actions/workflows/${WORKFLOW}/dispatches"
+        env:
+          RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+          OWNER: "AG_QGIS"
+          WORKFLOW: "release.yaml"
+          

changelog.txt

@@ -1,14 +1,15 @@
 ---
-Version 27-unstable-unstable:
+Version 11-unstable:
+- metadata.txt aktualisiert
 ---
-Version 26-unstable-unstable:
+Version 10-unstable:
+- Änderung 5
+- Änderung 6
 ---
-Version 25-unstable:
+Version 9-unstable:
+- Änderung 3
+- Änderung 4
 ---
-Version 24-unstable:
+Version 8-unstable:
----
+- Änderung 1
-Version 23-unstable
+- Änderung 2
- - Verzeichniss aufgeräumt
----
-Version 22-unstable
-  - Initiales Release

metadata.txt

@@ -3,8 +3,8 @@ name=LNO Sachsen | Plugin Test Action
 qgisMinimumVersion=3.40
 qgisMaximumVersion=3.99
 description=Test plugin for release pipeline
-version=27-unstable-unstable
+version=11-unstable
-author=Daniel Helbig
+author=Daniel Helbig, Michael Otto
 email=daniel.helbig@kreis-meissen.de
 homepage=https://entwicklung.flurneuordnung-sachsen.de/AG_QGIS/Plugin_Test_Action
 tracker=https://entwicklung.flurneuordnung-sachsen.de/AG_QGIS/Plugin_Test_Action/issues