ydeng/rsemcs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into sync-modpack

Browse Source
This commit is contained in:
Harrison Deng 2022-05-13 04:24:15 -05:00
commit 3eaa38abeb
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Jenkinsfile vendored
View File

@ -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") {
@ -38,6 +40,7 @@ pipeline {
sh "git merge -X theirs sync-modpack"
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']) {

BIN
mods/DynmapBlockScan-3.4-beta-1-forge-1.18.jar
View File

Binary file not shown.

4
scripts/load_block_scan.sh Executable file
View File

@ -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 ../../