From ab3833df91bdf8c58852d2e4be71d93de8888cb4 Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Mon, 12 Nov 2018 15:46:41 +0200 Subject: [PATCH] Travis configuration changes Created bash scripts for different steps and added them as jobs for travis to execute. Begun preparing system testing: Goal is enabling actual servers with the plugin to see if it enables --- .gitignore | 3 --- .travis.yml | 24 +++++++++++--------- scripts/eula.txt | 3 +++ scripts/prepareBuild.sh | 4 ++++ scripts/prepareServerJars.sh | 43 ++++++++++++++++++++++++++++++++++++ scripts/runTests.sh | 9 ++++++++ 6 files changed, 73 insertions(+), 13 deletions(-) create mode 100644 scripts/eula.txt create mode 100644 scripts/prepareBuild.sh create mode 100644 scripts/prepareServerJars.sh create mode 100644 scripts/runTests.sh diff --git a/.gitignore b/.gitignore index 04507e0be..dae2c4d82 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,6 @@ PlanPluginBridge.iml *.db -# Shell files -*.sh - # Created by https://www.gitignore.io/api/maven,eclipse,intellij,netbeans,osx,windows,notepadpp,windows,java ### Maven ### diff --git a/.travis.yml b/.travis.yml index 9cf181bf9..40ec172f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,7 @@ language: java sudo: false -install: true -before_install: - - cd PlanPluginBridge - - mvn install:install-file -Dfile=./PlanPluginBridge-4.5.0.jar -DpomFile=./pom.xml - - cd ../Plan -install: - - mvn clean +install: false + addons: sonarcloud: organization: "player-analytics-plan" @@ -14,10 +9,19 @@ addons: secure: "bTqGEUlfpVGgXgwC9UiIwYN+LsUtXFHTbWkAjnNJcCKTLDvHzUfDzY8/M7YIpIlcS7EWggNgJhskkg/WBglESx/0KcVl4NukMgbylqvp7y1F7eOkYLuriWBpuwMaSCHTWjmyq1iWNJ26i569PETbKiS+sNYnx9lPIpXI4ph0M9EKK3nQpTLr1aeVHi+XilJu6UNY7whipoW1fEwn02s2SvIXUMJN1fS0tmUjMavlOnlxt0lCU/oayMVG7vFKE2wWDJ5Ucd6lLGLPA1at4ypy6nJVcl8Bn547qoXBoIyMbtAhpcLUzkkFLK8BxuSsQ5neK71GLlmbiU+bIU5dpfRgsS3XLOXSSgide0ly/Za4zQVUBfu36F5xJOFGGdALGfMBhWdCzW1j0oDcINauUhjK/VB9v8M8qpxBCV6Q570FH2CQdNotfUWvHHGVZf1+yqXnC5iUcIh4cuxNCrOgp3uql8cpLGtMfqScV4l7GkcYGXLZlLUhGPK5K8UhwPym31CJU8If6ExMiKttxvpCtcGsXx2bRl7gRl3+xdjlY0PzIfbBbgYY6uu5v6cK8RHxp/+sLsBDfPtVvRZnnOVACLUFzTRSr6nP0Cm8rr+91S3rTmf4Qug+IN32xMDVcs6Sm68v/KTn2QoA2XyXOMLbIR39/0ani00xCd3FPF9Ae115YHg=" jdk: - oraclejdk8 -script: - - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then mvn test; fi' - - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then mvn org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar; fi' + +jobs: + include: + - stage: "Tests" + name: "Prepare build" + script: ./scripts/prepareBuild.sh + - name: "Unit tests" + script: ./scripts/runTests.sh + - stage: "System Tests" + name: "Test environment setup" + script: ./scripts/prepareServerJars.sh cache: directories: - '$HOME/.m2/repository' - '$HOME/.sonar/cache' + - '$HOME/servers/' diff --git a/scripts/eula.txt b/scripts/eula.txt new file mode 100644 index 000000000..4ccadc75d --- /dev/null +++ b/scripts/eula.txt @@ -0,0 +1,3 @@ +#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula). +#Sun Nov 27 12:07:48 EET 2016 +eula=true diff --git a/scripts/prepareBuild.sh b/scripts/prepareBuild.sh new file mode 100644 index 000000000..81c45a80a --- /dev/null +++ b/scripts/prepareBuild.sh @@ -0,0 +1,4 @@ +mvn clean +cd PlanPluginBridge +mvn install:install-file -Dfile=./PlanPluginBridge-4.5.0.jar -DpomFile=./pom.xml +cd .. \ No newline at end of file diff --git a/scripts/prepareServerJars.sh b/scripts/prepareServerJars.sh new file mode 100644 index 000000000..da1bb6e2f --- /dev/null +++ b/scripts/prepareServerJars.sh @@ -0,0 +1,43 @@ +mkdir $HOME/servers +mkdir $HOME/servers/build + +cd $HOME/servers + +SPIGOT_FOUND=[[ -e spigot.jar ]] +CRAFTBUKKIT_FOUND=[[ -e craftbukkit.jar ]] +SPONGE_FOUND=[[ -e sponge.jar ]] + + +cd $HOME/servers/build + +wget -O BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar +git config --global --unset core.autocrlf + +if [ ! $SPIGOT_FOUND ]; then + echo "Building spigot 1.12.2" + java -jar BuildTools.jar --rev 1.12.2 + cp spigot-1.12.2.jar ../spigot.jar +else + echo "Found spigot 1.12.2 jar" +fi + +if [ ! $CRAFTBUKKIT_FOUND ]; then + echo "Building craftbukkit 1.8" + java -jar BuildTools.jar --rev 1.8 + cp craftbukkit-1.8.jar ../craftbukkit.jar +else + echo "Found craftbukkit 1.8 jar" +fi + +if [ ! $SPONGE_FOUND ]; then + echo "Downloading sponge" + wget -O sponge.jar https://repo.spongepowered.org/maven/org/spongepowered/spongevanilla/1.12.2-7.1.4/spongevanilla-1.12.2-7.1.4.jar + cp sponge.jar ../sponge.jar +else + echo "Found sponge jar" +fi + + +cd $HOME/servers +rm -rf build +cd $HOME \ No newline at end of file diff --git a/scripts/runTests.sh b/scripts/runTests.sh new file mode 100644 index 000000000..0e6d51550 --- /dev/null +++ b/scripts/runTests.sh @@ -0,0 +1,9 @@ +cd Plan + +if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then + mvn test +fi + +if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then + mvn org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar +fi