From 609f309cd1b6009eab714a7fa98f67b51cafd6a6 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Wed, 28 Jun 2017 18:52:18 +0200 Subject: [PATCH] Removed autoupdate, addded deploy --- .travis.yml | 20 +++++++++++ deploy.sh | 11 ++++++ .../website/ButtonWebsiteModule.java | 1 - .../website/page/AutoUpdatePage.java | 35 ------------------- 4 files changed, 31 insertions(+), 36 deletions(-) create mode 100644 deploy.sh delete mode 100644 src/buttondevteam/website/page/AutoUpdatePage.java diff --git a/.travis.yml b/.travis.yml index 9bcf999..57bc7e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,23 @@ +cache: + directories: + - $HOME/.m2/repository/org/bukkit/craftbukkit +before_install: | # Wget BuildTools and run if cached folder not found + if [ ! -d "$HOME/.m2/repository/org/bukkit/craftbukkit/1.12-R0.1-SNAPSHOT" ]; then + wget -O BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar + java -jar BuildTools.jar --rev 1.12 + fi + language: java jdk: - oraclejdk8 +deploy: + # deploy develop to the staging environment + - provider: script + script: deploy.sh staging + on: + branch: dev + # deploy master to production + - provider: script + script: deploy.sh production + on: + branch: master diff --git a/deploy.sh b/deploy.sh new file mode 100644 index 0000000..636c48d --- /dev/null +++ b/deploy.sh @@ -0,0 +1,11 @@ +#!/bin/sh +FILENAME=$(find target/ ! -name '*original*' -name '*.jar') +echo Found file: $FILENAME + +if [ $1 = 'production' ]; then +echo Production mode +echo $UPLOAD_KEY > upload_key +chmod 400 upload_key +yes | scp -B -i upload_key -o StrictHostKeyChecking=no $FILENAME travis@server.figytuna.com:/minecraft/main/plugins +fi + diff --git a/src/buttondevteam/website/ButtonWebsiteModule.java b/src/buttondevteam/website/ButtonWebsiteModule.java index 6d3ce4f..2a3f9ff 100644 --- a/src/buttondevteam/website/ButtonWebsiteModule.java +++ b/src/buttondevteam/website/ButtonWebsiteModule.java @@ -111,7 +111,6 @@ public class ButtonWebsiteModule extends JavaPlugin { @Override public void onEnable() { addPage(new IndexPage()); - addPage(new AutoUpdatePage()); addPage(new LoginPage()); addPage(new ProfilePage()); TBMCCoreAPI.RegisterUserClass(WebUser.class); diff --git a/src/buttondevteam/website/page/AutoUpdatePage.java b/src/buttondevteam/website/page/AutoUpdatePage.java deleted file mode 100644 index d064d05..0000000 --- a/src/buttondevteam/website/page/AutoUpdatePage.java +++ /dev/null @@ -1,35 +0,0 @@ -package buttondevteam.website.page; - -import java.io.IOException; -import java.util.stream.Collectors; - -import com.sun.net.httpserver.HttpExchange; - -import buttondevteam.website.io.IOHelper; -import buttondevteam.website.io.Response; - -public class AutoUpdatePage extends Page { - - @Override - public String GetName() { - return "autoupdate"; - } - - @Override - public Response handlePage(HttpExchange exchange) { - if (exchange.getRequestHeaders().containsKey("Expect") - && exchange.getRequestHeaders().get("Expect").contains("100-continue")) - try { - exchange.sendResponseHeaders(100, -1); - exchange.getResponseBody().close(); - } catch (IOException e1) { - e1.printStackTrace(); - } - return new Response(200, - "Headers:\n" + exchange.getRequestHeaders().entrySet().stream() - .map(e -> e.getKey() + ": " + e.getValue().stream().collect(Collectors.joining(" "))) - .collect(Collectors.joining("\n")) + "\nPOST: " + IOHelper.GetPOST(exchange), - exchange); - } - -}