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

Reviewed-on: #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:
+    runs-on: self-hosted
+
     steps:
-    - name: Checkout Repository
-      uses: actions/checkout@v2
+      # Repository auschecken
+      - name: Checkout Repository
+        uses: actions/checkout@v3
 
-    - name: Set up Java 17
-      uses: actions/setup-java@v2
-      with:
-        java-version: '17'
-        distribution: 'adopt' # Verwenden Sie 'adopt' für Java 17
+      # Java 17 installieren
+      - name: Set up Java 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
 
-    - name: Update Apt
-      run: apt update -y
+      # Maven installieren
+      - name: Install Maven
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y maven
 
-    - name: Update CA certificates
-      run: apt-get install --reinstall ca-certificates -y
+      # 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
 
-    - name: Install Maven
-      run: apt install maven -y
+      # Projekt mit Maven bauen
+      - name: Build with Maven
+        run: mvn clean package
 
-    - name: Build with Maven
-      run: mvn clean install
+      # JAR-Datei umbenennen
+      - name: Rename JAR File
+        run: |
+          mv target/*.jar target/BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
 
-    - name: Upload Artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: BetterMinecraft-stable.jar
-        path: target/BetterMinecraft-stable.jar
-        steps:
-    - name: Checkout Repository
-      uses: actions/checkout@v2
+      # Artefakt hochladen
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
+          path: target/BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
 
-    - 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))"
-
-    - name: Create Release
-      id: create_release
-      uses: softprops/action-gh-release@v1
-      with:
-        files: |
-          target/BetterMinecraft-stable.jar
-        tag_name: ${{ steps.increment_version.outputs.major }}.${{ steps.increment_version.outputs.minor }}.${{ steps.increment_version.outputs.patch }}
-        release_name: Release ${{ steps.increment_version.outputs.major }}.${{ steps.increment_version.outputs.minor }}.${{ steps.increment_version.outputs.patch }}
-        draft: false
-        prerelease: false
+      # Release erstellen
+      - name: Create Release
+        uses: softprops/action-gh-release@v1
+        with:
+          files: target/BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
+          tag_name: ${{ env.PLUGIN_VERSION }}
+          release_name: Release ${{ env.PLUGIN_VERSION }}
+          draft: false
+          prerelease: true

.gitea/workflows/test-release.yml

@@ -3,8 +3,7 @@ name: Build and Release Minecraft Plugin
 on:
   push:
     branches:
-      - testing
-
+      - Testing
 
 jobs:
   build-and-release:
@@ -21,45 +20,41 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
 
-      # Maven installieren und vorbereiten
+      # Maven installieren
       - name: Install Maven
-        run: sudo apt-get update && sudo apt-get install -y maven
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y maven
 
-      # Projekt bauen
+      # 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 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
-          path: target/BetterMinecraft-stable.jar
-
-      # Letzte Release-Version abrufen
-      - name: Get last release version
-        id: get_version
-        run: |
-          echo "VERSION=$(git describe --tags --abbrev=0 || echo '0.0.0')" >> $GITHUB_ENV
-
-      # Version inkrementieren
-      - name: Increment version
-        id: increment_version
-        run: |
-          IFS='.' read -ra VERSION <<< "$VERSION"
-          MAJOR=${VERSION[0]:-0}
-          MINOR=${VERSION[1]:-0}
-          PATCH=${VERSION[2]:-0}
-          PATCH=$((PATCH + 1))
-          NEW_VERSION="$MAJOR.$MINOR.$PATCH"
-          echo "NEW_VERSION=$NEW_VERSION" >> $GITHUB_ENV
+          name: BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
+          path: target/BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
 
       # Release erstellen
       - name: Create Release
         uses: softprops/action-gh-release@v1
         with:
-          files: target/BetterMinecraft-stable.jar
-          tag_name: ${{ env.NEW_VERSION }}
-          release_name: Release ${{ env.NEW_VERSION }}
+          files: target/BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
+          tag_name: ${{ env.PLUGIN_VERSION }}
+          release_name: Release ${{ env.PLUGIN_VERSION }}
           draft: false
           prerelease: true

.gitea/workflows/test.md

@@ -1 +1 @@
-testtest
+testtesttesttrest