Attempt to fix maven building again

FireController1847 · Jun 20, 2024 · d1c0bd9 · d1c0bd9
1 parent 0a4eef9
commit d1c0bd9
Showing 1 changed file with 19 additions and 28 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -16,41 +16,36 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
+    strategy:
+      matrix:
+        java-version: [ 8, 17, 21 ]
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 8
+    - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '8'
-        distribution: 'temurin'
+        java-version: ${{ matrix.java-version }}
+        distribution: "temurin"
         cache: maven
-    - uses: SpraxDev/Action-SpigotMC@v4
+    - name: Build Spigot (JDK 8)
+      uses: SpraxDev/Action-SpigotMC@v4
       with:
         versions: 1.16.5, 1.16.3, 1.16.1, 1.15.2, 1.14.4, 1.13.2, 1.13, 1.12.2
         remapped: true
-    - name: Set up JDK 17
-      uses: actions/setup-java@v3
-      with:
-        java-version: '17'
-        distribution: 'temurin'
-        cache: maven
-    - uses: SpraxDev/Action-SpigotMC@v4
+      java-version: 8
+    - name: Build Spigot (JDK 17)
+      uses: SpraxDev/Action-SpigotMC@v4
       with:
         versions: 1.20.1, 1.19, 1.18.2, 1.18.1, 1.17.1
         remapped: true
-    - name: Set up JDK 21
-        uses: actions/setup-java@v3
-        with:
-          java-version: '21'
-          distribution: 'temurin'
-          cache: maven
-    - uses: SpraxDev/Action-SpigotMC@v4
-        with:
-          versions: 1.21, 1.20.6, 1.20.2
-          remapped: true
+      java-version: 17
+    - name: Build Spigot (JDK 21)
+      uses: SpraxDev/Action-SpigotMC@v4
+      with:
+        versions: 1.21, 1.20.6, 1.20.2
+        remapped: true
+      java-version: 21
     - name: Build with Maven
       run: mvn -B package --file pom.xml
     - name: Cache Maven
@@ -60,8 +55,4 @@ jobs:
         path: |
           ~/.m2
           ~/repository
-        key: ${{ github.job }}-${{ hashFiles('**/pom.xml') }}
-
-    # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
-    - name: Update dependency graph
-      uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
+        key: ${{ github.job }}-${{ hashFiles('**/pom.xml') }}