From 73cbac110a44b7056464ca440bb073fb46e8a1af Mon Sep 17 00:00:00 2001
From: Alex <40795980+AlexProgrammerDE@users.noreply.github.com>
Date: Sat, 2 Nov 2024 07:53:27 +0100
Subject: [PATCH] Add data merging (#35)

* Add data merging

* Update gradle actions

* Put out pr comments

* Add pull request write perm

* Only send comment on failure
---
 .github/workflows/build.yml | 38 +++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a277bd7..147dab9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,6 +7,9 @@ on:
     branches:
       - main
 
+permissions:
+  pull-requests: write
+
 jobs:
   define-versions:
     runs-on: ubuntu-latest
@@ -46,7 +49,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@v4
 
       - name: Set up JDK 21
         uses: actions/setup-java@v4
@@ -54,10 +57,13 @@ jobs:
           java-version: '21'
           distribution: 'temurin'
 
-      - name: Generate ${{ matrix.version }}
-        uses: gradle/gradle-build-action@v2
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
         with:
-          arguments: :mc:${{ matrix.version }}:runServer
+          add-job-summary-as-pr-comment: on-failure
+
+      - name: Generate ${{ matrix.version }}
+        run: ./gradlew :mc:${{ matrix.version }}:runServer --stacktrace
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
@@ -65,3 +71,27 @@ jobs:
           name: data-${{ matrix.version }}
           path: mc/${{ matrix.version }}/run/server/minecraft-data
           if-no-files-found: error
+
+  repackage:
+    needs: build
+
+    name: Repackage versions
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: artifacts
+          merge-multiple: true
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: merged-data
+          path: artifacts/*
+          if-no-files-found: error