diff --git a/Jenkinsfile b/Jenkinsfile index 434efdf..15d00ba 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,7 +15,7 @@ pipeline { } } } - stage("server launch test") { + stage("server launch") { when { not { branch '**/sync-modpack' @@ -24,10 +24,12 @@ pipeline { steps { sh 'echo "eula=true" > eula.txt' sh "chmod u+x ./run.sh" + sh "curl -o mods/DynmapBlockScan.jar -LJR https://github.com/webbukkit/DynmapBlockScan/releases/download/v3.4-beta-1/DynmapBlockScan-3.4-beta-1-forge-1.18.jar" lock('Port 25565') { sh 'echo "stop" | ./run.sh' } logParser failBuildOnError: true, projectRulePath: 'Jenkinsparse', parsingRulesPath: 'Jenkinsparse', showGraphs: true, unstableOnWarning: true, useProjectRule: true + sh "rm mods/DynmapBlockScan.jar" } } stage("commit changes") { @@ -37,6 +39,7 @@ pipeline { steps { sh "git add mods/**" sh "git add config/**" + sh "git add dynmap/renderdata/**" sh "git clean -dfX" sh returnStatus: true, script: "git commit -m 'Automatic integration of latest modpack.'" sshagent(['108c5045-64d1-42a6-acd7-a39da5e096d1']) { diff --git a/mods/DynmapBlockScan-3.4-beta-1-forge-1.18.jar b/mods/DynmapBlockScan-3.4-beta-1-forge-1.18.jar deleted file mode 100644 index 009e1c7..0000000 Binary files a/mods/DynmapBlockScan-3.4-beta-1-forge-1.18.jar and /dev/null differ diff --git a/scripts/load_block_scan.sh b/scripts/load_block_scan.sh new file mode 100755 index 0000000..3a4dc35 --- /dev/null +++ b/scripts/load_block_scan.sh @@ -0,0 +1,4 @@ +#!/bin/bash +cd server/mods +curl -LOJR https://github.com/webbukkit/DynmapBlockScan/releases/download/v3.4-beta-1/DynmapBlockScan-3.4-beta-1-forge-1.18.jar +cd ../../ \ No newline at end of file