From 365a0b4ef3d870d0abfd8cdd6635f4fbfbad973d Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 30 Dec 2023 09:44:08 -0500
Subject: [PATCH] Merged CI scripts

---
 .github/workflows/commitTest.yml |  4 ++--
 .github/workflows/prTest.yml     | 24 ------------------------
 2 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 .github/workflows/prTest.yml

diff --git a/.github/workflows/commitTest.yml b/.github/workflows/commitTest.yml
index 72fe005..7916b71 100644
--- a/.github/workflows/commitTest.yml
+++ b/.github/workflows/commitTest.yml
@@ -1,6 +1,6 @@
-name: Commit Testing
+name: Build Mod
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   buildJar:
diff --git a/.github/workflows/prTest.yml b/.github/workflows/prTest.yml
deleted file mode 100644
index dbeeaf2..0000000
--- a/.github/workflows/prTest.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Pull Request Testing
-
-on: [pull_request]
-
-jobs:
-  buildJar:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up PATH
-      run: |
-        echo "${ANDROID_HOME}/build-tools/34.0.0" >> $GITHUB_PATH
-    - name: Set up JDK 17
-      uses: actions/setup-java@v1
-      with:
-        java-version: 17
-    - name: Build mod jar
-      run: ./gradlew deploy
-    - name: Upload built jar file
-      uses: actions/upload-artifact@v2
-      with:
-        name: ${{ github.event.repository.name }} Pull Request
-        path: build/libs/${{ github.event.repository.name }}.jar