Merge remote-tracking branch 'origin/master'

eirikh1996 · Dec 6, 2020 · 99bebe1 · 99bebe1
2 parents 5c5e718 + da9ba49
commit 99bebe1
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -25,7 +25,6 @@ jobs:
     - name: Setup BuildTools
       run: mkdir BuildTools && wget -O BuildTools/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
 
-<<<<<<< HEAD
 # EXAMPLE - Copy/paste as required to add version support to CI
 #    - name: Test [version]
 #      id: [version name]
@@ -95,6 +94,12 @@ jobs:
     - name: Build 1.16.2
       if: steps.nether2.outputs.sucess != 'true'
       run: cd BuildTools && java -jar BuildTools.jar --rev 1.16.2 --compile craftbukkit
+    - name: Check 1.16.4
+      id: nether3
+      run: test -f ~/.m2/repository/org/bukkit/craftbukkit/1.16.4-R0.1-SNAPSHOT/craftbukkit-1.16.4-R0.1-SNAPSHOT.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+    - name: Build 1.16.4
+      if: steps.nether3.outputs.sucess != 'true'
+      run: cd BuildTools && java -jar BuildTools.jar --rev 1.16.4 --compile craftbukkit
 
 # EXAMPLE - Copy/paste as required to add version support to CI
 #    - name: Test [version]