From c576d037210b0354ac1f1f4107b4b4491ed43b40 Mon Sep 17 00:00:00 2001
From: James Peters <email@jamesdpeters.com>
Date: Mon, 17 Jan 2022 21:20:48 +0000
Subject: [PATCH] Update maven.yml

---
 .github/workflows/maven.yml | 69 ++++++++++++++++++++-----------------
 1 file changed, 37 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index b4aff3e..014645b 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -24,8 +24,7 @@ jobs:
         path: |
           ~/.m2
           ~/BuildTools
-        key: buildtools-cache-${{ hashFiles('spigot-*.jar') }}
-        restore-keys: buildtools-cache-
+        key: buildtools-cache-${{ hashFiles('**/spigot-*.jar') }}
     
     - name: Check BuildTools cached
       run: |
@@ -33,37 +32,37 @@ jobs:
         ls ~/BuildTools
       shell: bash
     
-    - name: Set up JDK 8
-      uses: actions/setup-java@v2
-      with:
-        java-version: '8'
-        distribution: 'adopt'
+#     - name: Set up JDK 8
+#       uses: actions/setup-java@v2
+#       with:
+#         java-version: '8'
+#         distribution: 'adopt'
         
-    - name: Run BuildTools Pre 1.17
-      working-directory: BuildTools
-      run: |
-        cd ~/BuildTools
-        # make file runnable, might not be necessary
-        chmod +x "${GITHUB_WORKSPACE}/BuildTools/build-pre1.17.sh"
-        # run script
-        bash ${GITHUB_WORKSPACE}/BuildTools/build-pre1.17.sh
-      shell: bash
+#     - name: Run BuildTools Pre 1.17
+#       working-directory: BuildTools
+#       run: |
+#         cd ~/BuildTools
+#         # make file runnable, might not be necessary
+#         chmod +x "${GITHUB_WORKSPACE}/BuildTools/build-pre1.17.sh"
+#         # run script
+#         bash ${GITHUB_WORKSPACE}/BuildTools/build-pre1.17.sh
+#       shell: bash
       
-    - name: Set up JDK 16
-      uses: actions/setup-java@v2
-      with:
-        java-version: '16'
-        distribution: 'adopt'
+#     - name: Set up JDK 16
+#       uses: actions/setup-java@v2
+#       with:
+#         java-version: '16'
+#         distribution: 'adopt'
 
-    - name: Run BuildTools 1.17
-      working-directory: BuildTools
-      run: |
-        cd ~/BuildTools
-        # make file runnable, might not be necessary
-        chmod +x "${GITHUB_WORKSPACE}/BuildTools/build-1.17.sh"
-        # run script
-        bash ${GITHUB_WORKSPACE}/BuildTools/build-1.17.sh
-      shell: bash
+#     - name: Run BuildTools 1.17
+#       working-directory: BuildTools
+#       run: |
+#         cd ~/BuildTools
+#         # make file runnable, might not be necessary
+#         chmod +x "${GITHUB_WORKSPACE}/BuildTools/build-1.17.sh"
+#         # run script
+#         bash ${GITHUB_WORKSPACE}/BuildTools/build-1.17.sh
+#       shell: bash
     
     - name: Set up JDK 17
       uses: actions/setup-java@v2
@@ -81,8 +80,14 @@ jobs:
         bash ${GITHUB_WORKSPACE}/BuildTools/build-1.18+.sh
       shell: bash
       
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml
+    - name: Check BuildTools cached
+      run: |
+        mkdir -p ~/BuildTools
+        ls ~/BuildTools
+      shell: bash
+      
+#     - name: Build with Maven
+#       run: mvn -B package --file pom.xml
               
     - name: Upload Release Asset
       id: upload-release-asset