From 2cfd4100893132254af7d591c50d7b10ece33d9f Mon Sep 17 00:00:00 2001
From: JojoFR1 <jojofr1@users.noreply.github.com>
Date: Sat, 3 Feb 2024 23:58:06 +0800
Subject: [PATCH] Unify build actions + update SDK version

(cherry picked from commit 89d3a56b8c284d9607cf1ac7fb03abc1b79ac0e6)
---
 .github/workflows/{Push.yml => Build.yml}     |  6 ++---
 .github/workflows/Release.yml                 |  2 +-
 .../workflows/TestBuildWhenPullRequest.yml    | 26 -------------------
 3 files changed, 4 insertions(+), 30 deletions(-)
 rename .github/workflows/{Push.yml => Build.yml} (86%)

diff --git a/.github/workflows/Push.yml b/.github/workflows/Build.yml
similarity index 86%
rename from .github/workflows/Push.yml
rename to .github/workflows/Build.yml
index 9f3d392..adf8560 100644
--- a/.github/workflows/Push.yml
+++ b/.github/workflows/Build.yml
@@ -1,5 +1,5 @@
-name: Build Push Changes
-on: [push, workflow_dispatch]
+name: Build Mod
+on: [push, pull_request, workflow_dispatch]
 
 jobs:
   build:
@@ -8,7 +8,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set Android SDK tools
-        run: echo "$ANDROID_HOME/build-tools/30.0.3" >> $GITHUB_PATH
+        run: echo "$ANDROID_HOME/build-tools/34.0.0" >> $GITHUB_PATH
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4
diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
index 0660354..8c5c492 100644
--- a/.github/workflows/Release.yml
+++ b/.github/workflows/Release.yml
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set Android SDK tools
-        run: echo "$ANDROID_HOME/build-tools/30.0.3" >> $GITHUB_PATH
+        run: echo "$ANDROID_HOME/build-tools/34.0.0" >> $GITHUB_PATH
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4
diff --git a/.github/workflows/TestBuildWhenPullRequest.yml b/.github/workflows/TestBuildWhenPullRequest.yml
index 5efffc1..e69de29 100644
--- a/.github/workflows/TestBuildWhenPullRequest.yml
+++ b/.github/workflows/TestBuildWhenPullRequest.yml
@@ -1,26 +0,0 @@
-name: Pull Request Testing
-
-on: [ pull_request ]
-
-jobs:
-  buildJar:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up PATH
-        run: |
-          echo "${ANDROID_HOME}/build-tools/30.0.1" >> $GITHUB_PATH
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          java-version: 17
-          distribution: 'temurin'
-          cache: 'gradle'
-      - name: Build mod jar
-        run: chmod +x gradlew && ./gradlew deploy
-      - name: Upload built jar file
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ github.event.repository.name }} Pull Request
-          path: build/tmp/deploy/${{ github.event.repository.name }}.jar