Merge pull request 'main' (#67) from main into Testing

Reviewed-on: Steev/betterminecraft#67

.gitea/workflows/release.yml

@@ -3,63 +3,59 @@ name: Build and Release Minecraft Plugin
 on:
   push:
     branches:
-      - release
+      - testing
 
 jobs:
-  build:
+  build-and-release:
-    steps:
+    runs-on: self-hosted
-    - name: Checkout Repository
-      uses: actions/checkout@v2
 
+    steps:
+      # Repository auschecken
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+
+      # Java 17 installieren
       - name: Set up Java 17
-      uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: '17'
-        distribution: 'adopt' # Verwenden Sie 'adopt' für Java 17
+          distribution: 'temurin'
-
-    - name: Update Apt
-      run: apt update -y
-
-    - name: Update CA certificates
-      run: apt-get install --reinstall ca-certificates -y
 
+      # Maven installieren
       - name: Install Maven
-      run: apt install maven -y
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y maven
 
+      # Plugin-Version aus plugin.yml auslesen
+      - name: Extract Plugin Version
+        id: extract_version
+        run: |
+          VERSION=$(grep '^version:' src/main/resources/plugin.yml | awk '{print $2}')
+          echo "PLUGIN_VERSION=$VERSION" >> $GITHUB_ENV
+
+      # Projekt mit Maven bauen
       - name: Build with Maven
-      run: mvn clean install
+        run: mvn clean package
 
+      # JAR-Datei umbenennen
+      - name: Rename JAR File
+        run: |
+          mv target/*.jar target/BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
+
+      # Artefakt hochladen
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:
-        name: BetterMinecraft-stable.jar
+          name: BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
-        path: target/BetterMinecraft-stable.jar
+          path: target/BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
-        steps:
-    - name: Checkout Repository
-      uses: actions/checkout@v2
-
-    - name: Get letzte Release-Version
-      id: get_version
-      run: echo "::set-output name=version::$(git describe --tags --abbrev=0 || echo '0.0.0')"
-
-    - name: Incrementiere Version
-      id: increment_version
-      run: |
-        IFS='.' read -ra VERSION <<< "${{ steps.get_version.outputs.version }}"
-        MAJOR="${VERSION[0]}"
-        MINOR="${VERSION[1]}"
-        PATCH="${VERSION[2]}"
-        echo "::set-output name=major::$(($MAJOR + 1))"
-        echo "::set-output name=minor::$(($MINOR + 1))"
-        echo "::set-output name=patch::$(($PATCH + 1))"
 
+      # Release erstellen
       - name: Create Release
-      id: create_release
         uses: softprops/action-gh-release@v1
         with:
-        files: |
+          files: target/BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
-          target/BetterMinecraft-stable.jar
+          tag_name: ${{ env.PLUGIN_VERSION }}
-        tag_name: ${{ steps.increment_version.outputs.major }}.${{ steps.increment_version.outputs.minor }}.${{ steps.increment_version.outputs.patch }}
+          release_name: Release ${{ env.PLUGIN_VERSION }}
-        release_name: Release ${{ steps.increment_version.outputs.major }}.${{ steps.increment_version.outputs.minor }}.${{ steps.increment_version.outputs.patch }}
           draft: false
-        prerelease: false
+          prerelease: true

.gitea/workflows/test-release.yml

@@ -1,14 +1,12 @@
 name: Build and Release Minecraft Plugin
 
 on:
-  pull_request:
+  push:
-    types: [closed]
     branches:
       - Testing
 
 jobs:
   build-and-release:
-    runs-on: self-hosted
     
     steps:
       # Repository auschecken
@@ -39,15 +37,6 @@ jobs:
       - name: Build with Maven
         run: mvn clean package
 
-      # PR Commit-Nachrichten auslesen
-      - name: Get PR Commit Messages
-        id: pr_commits
-        run: |
-          # PR-Commits abrufen
-          PR_COMMITS=$(git log --format=%s origin/${{ github.event.pull_request.base.ref }}..${{ github.sha }} --oneline)
-          echo "PR_COMMITS=$PR_COMMITS" >> $GITHUB_ENV
-          echo "$PR_COMMITS"
-
       # JAR-Datei umbenennen
       - name: Rename JAR File
         run: |
@@ -60,7 +49,7 @@ jobs:
           name: BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
           path: target/BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
 
-      # Release erstellen mit Changelog
+      # Release erstellen
       - name: Create Release
         uses: softprops/action-gh-release@v1
         with:
@@ -69,6 +58,3 @@ jobs:
           release_name: Release ${{ env.PLUGIN_VERSION }}
           draft: false
           prerelease: true
-          body: |
-            ## Changelog
-            ${{ env.PR_COMMITS }}