Run tests on CodeMC and Github Actions

YatopiaMC · Jan 31, 2021 · 96eb7ec · 96eb7ec
1 parent b8d5b1c
commit 96eb7ec
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -75,7 +75,7 @@ jobs:
 
     - name: Build Yatopia
       run: |
-        ./gradlew yatoclip
+        ./gradlew clean build yatoclip
         
     - name: Upload Artifact
       if: github.ref != 'refs/heads/ver/1.16.4'

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -51,7 +51,7 @@ pipeline {
                 ) {
                     withCredentials([usernamePassword(credentialsId: 'jenkins-deploy', usernameVariable: 'ORG_GRADLE_PROJECT_mavenUsername', passwordVariable: 'ORG_GRADLE_PROJECT_mavenPassword')]) {
                         sh '''
-                        ./gradlew clean yatoclip publish
+                        ./gradlew clean build yatoclip publish
                         mkdir -p "./target"
                         basedir=$(pwd)
                         paperworkdir="$basedir/Paper/work"

diff --git a/patches/api/0008-Suspected-plugins-report.patch b/patches/api/0008-Suspected-plugins-report.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Suspected plugins report
 Added "Suspected Plugins" to Watchdog, crash reports and exception messages
 
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 26685f59b235ea5b4c4fb7ae21acb5149edaa2b3..ed1c1bf2208177281829b14ebfbc5002efca5102 100644
+index 26685f59b235ea5b4c4fb7ae21acb5149edaa2b3..02c20a33161094b08dc2ae9353c0504561b0b452 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -560,7 +560,11 @@ public final class SimplePluginManager implements PluginManager {
@@ -35,11 +35,12 @@ index 26685f59b235ea5b4c4fb7ae21acb5149edaa2b3..ed1c1bf2208177281829b14ebfbc5002
                  if (!(event instanceof ServerExceptionEvent)) { // We don't want to cause an endless event loop
                      callEvent(new ServerExceptionEvent(new ServerEventException(msg, ex, registration.getPlugin(), registration.getListener(), event)));
                  }
-@@ -905,4 +913,9 @@ public final class SimplePluginManager implements PluginManager {
+@@ -905,4 +913,10 @@ public final class SimplePluginManager implements PluginManager {
      }
      // Paper end
 
 +    // Yatopia start - Accessor
++    @NotNull
 +    public Collection<PluginLoader> getPluginLoaders() {
 +        return new HashSet<>(fileAssociations.values());
 +    }
@@ -238,3 +239,20 @@ index 0000000000000000000000000000000000000000..0aa9bc6ad0a85d469b29201b9da29165
 +    }
 +
 +}
+diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
+index 4c2780c903ec354edac741b673a7174284a9849a..ed5629295324123576af992cb1b4c7ce90ffa1de 100644
+--- a/src/test/java/org/bukkit/AnnotationTest.java
++++ b/src/test/java/org/bukkit/AnnotationTest.java
+@@ -49,8 +49,11 @@ public class AnnotationTest {
+         "co/aikar/timings/TimingHistory$2$1$2",
+         "co/aikar/timings/TimingHistory$3",
+         "co/aikar/timings/TimingHistory$4",
+-        "co/aikar/timings/TimingHistoryEntry$1"
++        "co/aikar/timings/TimingHistoryEntry$1",
+         // Paper end
++        // Yatopia start
++        "org/yatopiamc/yatopia/api/internal/StackTraceUtils"
++        // Yatopia end
+     };
+
+     @Test