Skip to content
This repository was archived by the owner on Jun 19, 2021. It is now read-only.

Commit 96eb7ec

Browse files
committed
Run tests on CodeMC and Github Actions
1 parent b8d5b1c commit 96eb7ec

File tree

3 files changed

+22
-4
lines changed

3 files changed

+22
-4
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575

7676
- name: Build Yatopia
7777
run: |
78-
./gradlew yatoclip
78+
./gradlew clean build yatoclip
7979
8080
- name: Upload Artifact
8181
if: github.ref != 'refs/heads/ver/1.16.4'

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ pipeline {
5151
) {
5252
withCredentials([usernamePassword(credentialsId: 'jenkins-deploy', usernameVariable: 'ORG_GRADLE_PROJECT_mavenUsername', passwordVariable: 'ORG_GRADLE_PROJECT_mavenPassword')]) {
5353
sh '''
54-
./gradlew clean yatoclip publish
54+
./gradlew clean build yatoclip publish
5555
mkdir -p "./target"
5656
basedir=$(pwd)
5757
paperworkdir="$basedir/Paper/work"

patches/api/0008-Suspected-plugins-report.patch

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Subject: [PATCH] Suspected plugins report
66
Added "Suspected Plugins" to Watchdog, crash reports and exception messages
77

88
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
9-
index 26685f59b235ea5b4c4fb7ae21acb5149edaa2b3..ed1c1bf2208177281829b14ebfbc5002efca5102 100644
9+
index 26685f59b235ea5b4c4fb7ae21acb5149edaa2b3..02c20a33161094b08dc2ae9353c0504561b0b452 100644
1010
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
1111
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
1212
@@ -560,7 +560,11 @@ public final class SimplePluginManager implements PluginManager {
@@ -35,11 +35,12 @@ index 26685f59b235ea5b4c4fb7ae21acb5149edaa2b3..ed1c1bf2208177281829b14ebfbc5002
3535
if (!(event instanceof ServerExceptionEvent)) { // We don't want to cause an endless event loop
3636
callEvent(new ServerExceptionEvent(new ServerEventException(msg, ex, registration.getPlugin(), registration.getListener(), event)));
3737
}
38-
@@ -905,4 +913,9 @@ public final class SimplePluginManager implements PluginManager {
38+
@@ -905,4 +913,10 @@ public final class SimplePluginManager implements PluginManager {
3939
}
4040
// Paper end
4141

4242
+ // Yatopia start - Accessor
43+
+ @NotNull
4344
+ public Collection<PluginLoader> getPluginLoaders() {
4445
+ return new HashSet<>(fileAssociations.values());
4546
+ }
@@ -238,3 +239,20 @@ index 0000000000000000000000000000000000000000..0aa9bc6ad0a85d469b29201b9da29165
238239
+ }
239240
+
240241
+}
242+
diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
243+
index 4c2780c903ec354edac741b673a7174284a9849a..ed5629295324123576af992cb1b4c7ce90ffa1de 100644
244+
--- a/src/test/java/org/bukkit/AnnotationTest.java
245+
+++ b/src/test/java/org/bukkit/AnnotationTest.java
246+
@@ -49,8 +49,11 @@ public class AnnotationTest {
247+
"co/aikar/timings/TimingHistory$2$1$2",
248+
"co/aikar/timings/TimingHistory$3",
249+
"co/aikar/timings/TimingHistory$4",
250+
- "co/aikar/timings/TimingHistoryEntry$1"
251+
+ "co/aikar/timings/TimingHistoryEntry$1",
252+
// Paper end
253+
+ // Yatopia start
254+
+ "org/yatopiamc/yatopia/api/internal/StackTraceUtils"
255+
+ // Yatopia end
256+
};
257+
258+
@Test

0 commit comments

Comments
 (0)