Update CI/CD for 1.21

stefvanschie · Aug 14, 2024 · 3b7fbb5 · 3b7fbb5
1 parent 19d9a87
commit 3b7fbb5
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 4 deletions.
diff --git a/.github/workflows/auto-deploy.yml b/.github/workflows/auto-deploy.yml
@@ -76,7 +76,7 @@ jobs:
         mvn paper-nms:init -pl nms/1_20_1
         mvn paper-nms:init -pl nms/1_20_2
         mvn paper-nms:init -pl nms/1_20_3-4
-    - name: 'Run BuildTools 1.20.5 & 1.20.6'
+    - name: 'Run BuildTools 1.20.5-1.20.6, 1.21'
       if: steps.cache-paperclip-jars.outputs.cache-hit != 'true'
       run: |
         mkdir -p build
@@ -105,7 +105,24 @@ jobs:
 
         java -jar BuildTools.jar --remapped --disable-java-check --dont-update
         java -jar BuildTools.jar --rev 1.20.6 --remapped --disable-java-check
-        java -jar BuildTools.jar --rev 1.21 --remapped --disable-java-check
+        
+        cd Bukkit
+        git checkout 2ec53f498e32b3af989cb24672fc54dfab087154
+        cd ..
+
+        cd CraftBukkit
+        git checkout 8ee6fd1b8db9896590aa321d0199453de1fc35db
+        cd ..
+
+        cd Spigot
+        git checkout fb8fb722a327a2f9f097f2ded700ac5de8157408
+        cd ..
+
+        cd BuildData
+        git checkout ae1e7b1e31cd3a3892bb05a6ccdcecc48c73c455
+        cd ..
+        
+        java -jar BuildTools.jar --remapped --disable-java-check --dont-update
         cd ../
     - name: Setup GPG keys
       run: cat <(echo -e "${{ secrets.GPG_KEY }}") | gpg --batch --import

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -82,7 +82,7 @@ jobs:
         mvn paper-nms:init -pl nms/1_20_1
         mvn paper-nms:init -pl nms/1_20_2
         mvn paper-nms:init -pl nms/1_20_3-4
-    - name: 'Run BuildTools 1.20.5 & 1.20.6'
+    - name: 'Run BuildTools 1.20.5-1.20.6, 1.21'
       if: steps.cache-paperclip-jars.outputs.cache-hit != 'true'
       run: |
         mkdir -p build
@@ -111,7 +111,24 @@ jobs:
         
         java -jar BuildTools.jar --remapped --disable-java-check --dont-update
         java -jar BuildTools.jar --rev 1.20.6 --remapped --disable-java-check
-        java -jar BuildTools.jar --rev 1.21 --remapped --disable-java-check
+        
+        cd Bukkit
+        git checkout 2ec53f498e32b3af989cb24672fc54dfab087154
+        cd ..
+
+        cd CraftBukkit
+        git checkout 8ee6fd1b8db9896590aa321d0199453de1fc35db
+        cd ..
+
+        cd Spigot
+        git checkout fb8fb722a327a2f9f097f2ded700ac5de8157408
+        cd ..
+
+        cd BuildData
+        git checkout ae1e7b1e31cd3a3892bb05a6ccdcecc48c73c455
+        cd ..
+        
+        java -jar BuildTools.jar --remapped --disable-java-check --dont-update
         cd ../
     - name: Build with Maven
       run: mvn -B package --file pom.xml