From 5e37d2c371f22983a5dba31014c160ad96c19ecd Mon Sep 17 00:00:00 2001
From: Dawson <30784509+funkemunky@users.noreply.github.com>
Date: Mon, 30 Oct 2023 09:50:47 -0400
Subject: [PATCH 1/2] Updating to run on pull request

---
 .github/workflows/maven.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index b2b3197..1c6b302 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -1,6 +1,10 @@
 on:
   push:
     branches: ["**"]
+  pull_request:
+    types:
+      - opened
+      - synchronize
  
 jobs:
   build:
@@ -26,4 +30,4 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: AntiVPN
-          path: Assembly/target/Assembly-*.jar
\ No newline at end of file
+          path: Assembly/target/Assembly-*.jar

From ca8fb24134355ab5cb053c6203896a36ed327021 Mon Sep 17 00:00:00 2001
From: Dawson Hessler <funkemunkybiz@gmail.com>
Date: Mon, 30 Oct 2023 09:54:58 -0400
Subject: [PATCH 2/2] Caching maven repos properly

---
 .github/workflows/maven.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 1c6b302..9584dff 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -20,8 +20,10 @@ jobs:
       - name: Cache Maven packages
         uses: actions/cache@v2
         with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          path: ~/.m2/repository  # Cache the Maven repository
+          key: maven-${{ runner.os }}-${{ hashFiles('**/*.xml') }}
+          restore-keys: |
+            maven-${{ runner.os }}-
       - name: Compile
         run: mvn -B -Pclean install
         env: