mirror/Purpur
2
0
Fork 0
mirror of https://github.com/PurpurMC/Purpur.git synced 2025-02-23 13:09:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Integrate jenkins for versioning

Browse Source
This commit is contained in:
William Blake Galbreath 2019-05-16 00:53:37 -05:00
parent 95f88c5dc6
commit d20b5799eb
1 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
patches/api/0001-Rebrand.patch
View File

@ -1,12 +1,12 @@
From 053dd1e014ce1dc92795b080f59a2ac00b2234ef Mon Sep 17 00:00:00 2001
From c0a94c015e2137cb71695e506d309b88a07193f8 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 00:57:16 -0500
Subject: [PATCH] Rebrand
---
pom.xml | 9 ++++-----
.../command/defaults/VersionCommand.java | 20 ++++++++++---------
2 files changed, 15 insertions(+), 14 deletions(-)
pom.xml | 9 ++++-----
.../java/org/bukkit/command/defaults/VersionCommand.java | 8 ++++----
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index dbbb5c72..41743131 100644
@ -36,7 +36,7 @@ index dbbb5c72..41743131 100644
<properties>
diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
index ece8d1c8..0c1b0a61 100644
index ece8d1c8..2392f92c 100644
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
@@ -211,8 +211,8 @@ public class VersionCommand extends BukkitCommand {
@ -50,29 +50,24 @@ index ece8d1c8..0c1b0a61 100644
int distance = getDistance(null, parts[0]);
switch (distance) {
case -1:
@@ -263,13 +263,15 @@ public class VersionCommand extends BukkitCommand {
// Paper start
private static int getDistance(@NotNull String repo, @NotNull String verInfo) {
- try {
- int currentVer = Integer.decode(verInfo);
- return getFromJenkins(currentVer);
- } catch (NumberFormatException ex) {
- verInfo = verInfo.replace("\"", "");
@@ -268,7 +268,7 @@ public class VersionCommand extends BukkitCommand {
return getFromJenkins(currentVer);
} catch (NumberFormatException ex) {
verInfo = verInfo.replace("\"", "");
- return getFromRepo("PaperMC/Paper", "ver/1.14", verInfo); // Just for now
- }
+ // Purpur start
+ //try {
+ // int currentVer = Integer.decode(verInfo);
+ // return getFromJenkins(currentVer);
+ //} catch (NumberFormatException ex) {
+ //verInfo = verInfo.replace("\"", "");
+ return getFromRepo("pl3xgaming/Purpur", "ver/1.14", verInfo.replace("\"", ""));
+ //}
+ // Purpur end
+ return getFromRepo("pl3xgaming/Purpur", "master", verInfo); // Purpur
}
/*
BufferedReader reader = Resources.asCharSource(
new URL("https://hub.spigotmc.org/stash/rest/api/1.0/projects/SPIGOT/repos/" + repo + "/commits?since=" + URLEncoder.encode(hash, "UTF-8") + "&withCounts=true"),
@@ -290,7 +290,7 @@ public class VersionCommand extends BukkitCommand {
private static int getFromJenkins(int currentVer) {
try {
BufferedReader reader = Resources.asCharSource(
- new URL("https://ci.destroystokyo.com/job/Paper-1.14/lastSuccessfulBuild/buildNumber"), // Paper
+ new URL("http://ci.pl3x.net/job/Purpur/lastSuccessfulBuild/buildNumber"), // Purpur // Paper
Charsets.UTF_8
).openBufferedStream();
try {
--
2.20.1