Improve Actions build

Author: PimvanderLoos

.github/workflows/build-nms.yml

@@ -23,18 +23,17 @@ jobs:
           GROUPS_FILE: ${{ inputs.groups-file }}
         run: |
           import json, yaml, os
-          version_map = {"java8": 8, "java16": 16, "java17": 17, "java21": 21}
+          versions = {"java8": 8, "java16": 16, "java17": 17, "java21": 21}
           with open(os.environ["GROUPS_FILE"], encoding="utf-8") as fh:
               groups = yaml.safe_load(fh) or {}
           include = []
-          for name, java in version_map.items():
+          for name, java in versions.items():
               for version in groups.get(name) or []:
-                  safe = version.replace('.', '-')
                   include.append({
                       "group": name,
                       "java": java,
                       "version": version,
-                      "artifact": f"{name}-{safe}"
+                      "artifact": f"{name}-{version.replace('.', '-')}"
                   })
           matrix_json = json.dumps({"include": include})
           has_work = "true" if include else "false"
@@ -54,13 +53,17 @@ jobs:
     steps:
       - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955
 
-      - name: Restore Maven slice
+      - name: Restore aggregated Maven cache (best effort)
+        id: aggregate-cache
         uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830
         with:
           key: ${{ env.CACHE_KEY }}
           restore-keys: |
             nms-cache-
-          path: ~/.m2/repository/org/spigotmc/spigot
+          path: |
+            ~/.m2/repository/org/spigotmc/spigot
+            ~/.m2/repository/org/spigotmc/spigot-parent
+            ~/.m2/repository/net/md-5
 
       - name: Set up JDK
         uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
@@ -69,21 +72,25 @@ jobs:
           java-version: ${{ matrix.java }}
 
       - name: Build NMS
+        if: ${{ inputs.force-rebuild || steps.aggregate-cache.outputs.cache-hit != 'true' || !hashFiles(format('~/.m2/repository/org/spigotmc/spigot/*{0}*/spigot-*.jar', matrix.version)) }}
         uses: SpraxDev/Action-SpigotMC@e63b635efcbaeb868bf21878c46f61b7d919a0ac
         with:
           versions: ${{ matrix.version }}
 
       - name: Package Maven fragment
         run: |
           mkdir -p fragments
-          tar -C ~/.m2/repository -czf fragments/spigot-${{ matrix.artifact }}.tgz org/spigotmc/spigot
+          tar -C ~/.m2/repository -czf fragments/nms-${{ matrix.artifact }}.tgz \
+            org/spigotmc/spigot \
+            org/spigotmc/spigot-parent \
+            net/md-5
         shell: bash
 
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
-          name: spigot-${{ matrix.artifact }}
-          path: fragments/spigot-${{ matrix.artifact }}.tgz
-          retention-days: 7
+          name: nms-${{ matrix.artifact }}
+          path: fragments/nms-${{ matrix.artifact }}.tgz
+          retention-days: 1
 
   aggregate-cache:
     needs: [resolve-groups, compile]
@@ -94,15 +101,15 @@ jobs:
     steps:
       - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
-          pattern: spigot-*
+          pattern: nms-*
           path: artifacts
           merge-multiple: true
 
       - name: Merge Maven fragments
         run: |
           mkdir -p ~/.m2/repository
           shopt -s nullglob
-          for tgz in artifacts/spigot-*.tgz; do
+          for tgz in artifacts/nms-*.tgz; do
             tar -C ~/.m2/repository -xzf "$tgz"
           done
         shell: bash
@@ -111,4 +118,16 @@ jobs:
         uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830
         with:
           key: ${{ env.CACHE_KEY }}
-          path: ~/.m2/repository/org/spigotmc/spigot
+          path: |
+            ~/.m2/repository/org/spigotmc/spigot
+            ~/.m2/repository/org/spigotmc/spigot-parent
+            ~/.m2/repository/net/md-5
+
+  cleanup-artifacts:
+    needs: aggregate-cache
+    if: ${{ always() }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: GeekyEggo/delete-artifact@65041433121f7239077fa20be14c0690f70569de # v4.1.0
+        with:
+          name: nms-*

.github/workflows/build.yml

@@ -46,11 +46,22 @@ jobs:
             nms-cache-
           path: |
             ~/.m2/repository/org/spigotmc/spigot
+            ~/.m2/repository/org/spigotmc/spigot-parent
+            ~/.m2/repository/net/md-5
 
       - name: Build and Test
         run: |
           mvn --batch-mode --show-version --no-transfer-progress \
           clean \
           test \
-          verify
+          verify \
+          -Djava.net.preferIPv6Addresses=true
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: BigDoors
+          path: core/target/BigDoors.jar
+          if-no-files-found: error
+          compression-level: 0
 

hooks/hook-medieval-factions/pom.xml

@@ -17,6 +17,10 @@
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
         </repository>
+        <repository>
+            <id>dansplugins</id>
+            <url>https://repo.dansplugins.com/repository/maven-public/</url>
+        </repository>
     </repositories>
 
     <dependencies>

hooks/hook-plotsquared-7/pom.xml

@@ -12,7 +12,7 @@
     </parent>
 
     <properties>
-        <dependency.plotsquared.version>7.0.0-SNAPSHOT</dependency.plotsquared.version>
+        <dependency.plotsquared.version>7.0.0</dependency.plotsquared.version>
     </properties>
 
     <repositories>