Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion scripts/push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ push_release_artifacts() {
run druid push artifacts.druid.gg/druid-team/scroll-minecraft-spigot:26.1.1 ./scrolls/minecraft/minecraft-spigot/26.1.1 -p main=25565 -p rcon=25575 -i artifacts.druid.gg/druid-team/druid:v0.1.257 --min-disk 3Gi --min-ram 512Mi --min-cpu 0.25 --smart --category minecraft
run druid push artifacts.druid.gg/druid-team/scroll-minecraft-spigot:26.1.2 ./scrolls/minecraft/minecraft-spigot/26.1.2 -p main=25565 -p rcon=25575 -i artifacts.druid.gg/druid-team/druid:v0.1.257 --min-disk 3Gi --min-ram 512Mi --min-cpu 0.25 --smart --category minecraft
run druid push artifacts.druid.gg/druid-team/scroll-minecraft-spigot:26.2 ./scrolls/minecraft/minecraft-spigot/26.2 -p main=25565 -p rcon=25575 -i artifacts.druid.gg/druid-team/druid:v0.1.257 --min-disk 3Gi --min-ram 512Mi --min-cpu 0.25 --smart --category minecraft
run druid push artifacts.druid.gg/druid-team/scroll-minecraft-spigot:26.3 ./scrolls/minecraft/minecraft-spigot/26.3 -p main=25565 -p rcon=25575 -i artifacts.druid.gg/druid-team/druid:v0.1.257 --min-disk 3Gi --min-ram 512Mi --min-cpu 0.25 --smart --category minecraft
run druid push artifacts.druid.gg/druid-team/scroll-minecraft-vanilla:1.17 ./scrolls/minecraft/minecraft-vanilla/1.17 -p main=25565 -p rcon=25575 -i artifacts.druid.gg/druid-team/druid:v0.1.257 --min-disk 3Gi --min-ram 512Mi --min-cpu 0.25 --smart --category minecraft
run druid push artifacts.druid.gg/druid-team/scroll-minecraft-vanilla:1.17.1 ./scrolls/minecraft/minecraft-vanilla/1.17.1 -p main=25565 -p rcon=25575 -i artifacts.druid.gg/druid-team/druid:v0.1.257 --min-disk 3Gi --min-ram 512Mi --min-cpu 0.25 --smart --category minecraft
run druid push artifacts.druid.gg/druid-team/scroll-minecraft-vanilla:1.18 ./scrolls/minecraft/minecraft-vanilla/1.18 -p main=25565 -p rcon=25575 -i artifacts.druid.gg/druid-team/druid:v0.1.257 --min-disk 3Gi --min-ram 512Mi --min-cpu 0.25 --smart --category minecraft
Expand Down Expand Up @@ -210,6 +211,7 @@ push_release_artifacts() {
run druid push artifacts.druid.gg/druid-team/scroll-minecraft-vanilla:26.1.1 ./scrolls/minecraft/minecraft-vanilla/26.1.1 -p main=25565 -p rcon=25575 -i artifacts.druid.gg/druid-team/druid:v0.1.257 --min-disk 3Gi --min-ram 512Mi --min-cpu 0.25 --smart --category minecraft
run druid push artifacts.druid.gg/druid-team/scroll-minecraft-vanilla:26.1.2 ./scrolls/minecraft/minecraft-vanilla/26.1.2 -p main=25565 -p rcon=25575 -i artifacts.druid.gg/druid-team/druid:v0.1.257 --min-disk 3Gi --min-ram 512Mi --min-cpu 0.25 --smart --category minecraft
run druid push artifacts.druid.gg/druid-team/scroll-minecraft-vanilla:26.2 ./scrolls/minecraft/minecraft-vanilla/26.2 -p main=25565 -p rcon=25575 -i artifacts.druid.gg/druid-team/druid:v0.1.257 --min-disk 3Gi --min-ram 512Mi --min-cpu 0.25 --smart --category minecraft
run druid push artifacts.druid.gg/druid-team/scroll-minecraft-vanilla:26.3 ./scrolls/minecraft/minecraft-vanilla/26.3 -p main=25565 -p rcon=25575 -i artifacts.druid.gg/druid-team/druid:v0.1.257 --min-disk 3Gi --min-ram 512Mi --min-cpu 0.25 --smart --category minecraft
run druid push artifacts.druid.gg/druid-team/scroll-minecraft-paper:1.17 ./scrolls/minecraft/papermc/1.17 -p main=25565 -p rcon=25575 -i artifacts.druid.gg/druid-team/druid:v0.1.257 --min-disk 3Gi --min-ram 512Mi --min-cpu 0.25 --smart --category minecraft
run druid push artifacts.druid.gg/druid-team/scroll-minecraft-paper:1.17.1 ./scrolls/minecraft/papermc/1.17.1 -p main=25565 -p rcon=25575 -i artifacts.druid.gg/druid-team/druid:v0.1.257 --min-disk 3Gi --min-ram 512Mi --min-cpu 0.25 --smart --category minecraft
run druid push artifacts.druid.gg/druid-team/scroll-minecraft-paper:1.18.1 ./scrolls/minecraft/papermc/1.18.1 -p main=25565 -p rcon=25575 -i artifacts.druid.gg/druid-team/druid:v0.1.257 --min-disk 3Gi --min-ram 512Mi --min-cpu 0.25 --smart --category minecraft
Expand All @@ -235,7 +237,8 @@ push_release_artifacts() {
run druid push artifacts.druid.gg/druid-team/scroll-minecraft-paper:1.21.11 ./scrolls/minecraft/papermc/1.21.11 -p main=25565 -p rcon=25575 -i artifacts.druid.gg/druid-team/druid:v0.1.257 --min-disk 3Gi --min-ram 512Mi --min-cpu 0.25 --smart --category minecraft
run druid push artifacts.druid.gg/druid-team/scroll-minecraft-paper:26.1.1 ./scrolls/minecraft/papermc/26.1.1 -p main=25565 -p rcon=25575 -i artifacts.druid.gg/druid-team/druid:v0.1.257 --min-disk 3Gi --min-ram 512Mi --min-cpu 0.25 --smart --category minecraft
run druid push artifacts.druid.gg/druid-team/scroll-minecraft-paper:26.1.2 ./scrolls/minecraft/papermc/26.1.2 -p main=25565 -p rcon=25575 -i artifacts.druid.gg/druid-team/druid:v0.1.257 --min-disk 3Gi --min-ram 512Mi --min-cpu 0.25 --smart --category minecraft
run druid push artifacts.druid.gg/druid-team/scroll-minecraft-paper:26.2 ./scrolls/minecraft/papermc/26.2 -p main=25565 -p rcon=25575 -i artifacts.druid.gg/druid-team/druid:v0.1.257 --min-disk 3Gi --min-ram 512Mi --min-cpu 0.25 --smart --category minecraft
run druid push artifacts.druid.gg/druid-team/scroll-minecraft-paper:26.2 ./scrolls/minecraft/papermc/26.2
run druid push artifacts.druid.gg/druid-team/scroll-minecraft-paper:26.3 ./scrolls/minecraft/papermc/26.3 -p main=25565 -p rcon=25575 -i artifacts.druid.gg/druid-team/druid:v0.1.257 --min-disk 3Gi --min-ram 512Mi --min-cpu 0.25 --smart --category minecraft
run druid push artifacts.druid.gg/druid-team/scroll-minecraft-forge:1.17.1 ./scrolls/minecraft/forge/1.17.1 -p main=25565 -p rcon=25575 -i artifacts.druid.gg/druid-team/druid:v0.1.257 --min-disk 3Gi --min-ram 512Mi --min-cpu 0.25 --smart --category minecraft
run druid push artifacts.druid.gg/druid-team/scroll-minecraft-forge:1.18 ./scrolls/minecraft/forge/1.18 -p main=25565 -p rcon=25575 -i artifacts.druid.gg/druid-team/druid:v0.1.257 --min-disk 3Gi --min-ram 512Mi --min-cpu 0.25 --smart --category minecraft
run druid push artifacts.druid.gg/druid-team/scroll-minecraft-forge:1.18.1 ./scrolls/minecraft/forge/1.18.1 -p main=25565 -p rcon=25575 -i artifacts.druid.gg/druid-team/druid:v0.1.257 --min-disk 3Gi --min-ram 512Mi --min-cpu 0.25 --smart --category minecraft
Expand Down
6 changes: 3 additions & 3 deletions scripts/stage-scroll-ui/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -332,8 +332,8 @@ func TestCatalogCoversEveryCheckedInGameServerScroll(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if count != 124 {
t.Fatalf("checked Scroll count = %d, want 124", count)
if count != 127 {
t.Fatalf("checked Scroll count = %d, want 127", count)
}
}

Expand Down Expand Up @@ -386,7 +386,7 @@ func TestEveryCheckedInGameServerScrollStagesAsACompleteUIPackage(t *testing.T)
if err != nil {
t.Fatal(err)
}
if count != 124 {
if count != 127 {
t.Fatalf("staged Scroll count = %d, want 124", count)
}
}
Expand Down
3 changes: 2 additions & 1 deletion scrolls/minecraft/minecraft-spigot/.build/artifacts.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@
"26.1": "artifacts.druid.gg/druid-team/scroll-minecraft-spigot:26.1",
"26.1.1": "artifacts.druid.gg/druid-team/scroll-minecraft-spigot:26.1.1",
"26.1.2": "artifacts.druid.gg/druid-team/scroll-minecraft-spigot:26.1.2",
"26.2": "artifacts.druid.gg/druid-team/scroll-minecraft-spigot:26.2"
"26.2": "artifacts.druid.gg/druid-team/scroll-minecraft-spigot:26.2",
"26.3": "artifacts.druid.gg/druid-team/scroll-minecraft-spigot:26.3"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
#Minecraft server properties
#Mon Apr 11 00:50:50 CEST 2022
enable-jmx-monitoring=false
rcon.port=__DRUID_PORT_RCON__
gamemode=survival
enable-command-block=false
enable-query=false
level-name=world
motd=A Minecraft Server
query.port=__DRUID_PORT_MAIN__
pvp=true
difficulty=easy
network-compression-threshold=256
require-resource-pack=false
max-tick-time=60000
use-native-transport=true
max-players=20
online-mode=true
enable-status=true
allow-flight=false
broadcast-rcon-to-ops=true
view-distance=10
server-ip=
resource-pack-prompt=
allow-nether=true
server-port=__DRUID_PORT_MAIN__
enable-rcon=true
sync-chunk-writes=true
op-permission-level=4
prevent-proxy-connections=false
resource-pack=
entity-broadcast-range-percentage=100
rcon.password=__DRUID_RCON_PASSWORD__
player-idle-timeout=0
debug=false
force-gamemode=false
rate-limit=0
hardcore=false
white-list=false
broadcast-console-to-ops=true
spawn-npcs=true
spawn-animals=true
snooper-enabled=true
function-permission-level=2
text-filtering-config=
spawn-monsters=true
enforce-whitelist=false
resource-pack-sha1=
spawn-protection=16
max-world-size=29999984
30 changes: 30 additions & 0 deletions scrolls/minecraft/minecraft-spigot/26.3/data/start.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#!/bin/bash
set -e

MAX=${DRUID_MAX_MEMORY:-}
MAX=${MAX%?}
if [ -z "${MAX}" ];
then
MAX=1024M
fi

if [ ! -f server.properties ] && [ -f server.properties.default ]; then
if [ -f .druid-rcon-password ]; then
RCON_PASSWORD=$(cat .druid-rcon-password)
else
umask 077
RCON_PASSWORD=$(LC_ALL=C tr -dc 'A-Za-z0-9' < /dev/urandom | head -c 50 || true)
if [ "${#RCON_PASSWORD}" -ne 50 ]; then
echo "Failed to generate RCON password" >&2
exit 1
fi
printf '%s\n' "$RCON_PASSWORD" > .druid-rcon-password
fi
sed \
-e "s|__DRUID_RCON_PASSWORD__|$RCON_PASSWORD|g" \
-e "s|__DRUID_PORT_MAIN__|${DRUID_PORT_MAIN_1:-25565}|g" \
-e "s|__DRUID_PORT_RCON__|${DRUID_PORT_RCON_1:-25575}|g" \
server.properties.default > server.properties
fi

java -Xmx$MAX -Xms1024M -jar spigot.jar nogui
34 changes: 34 additions & 0 deletions scrolls/minecraft/minecraft-spigot/26.3/data/update.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#default update script

SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"

if [ ! -f "$SCRIPTPATH/scroll-lock.json" ]; then
echo "Scroll lock not found. Skipping update"
exit 0
fi

if [ -z "$(ls $SCRIPTPATH/update)" ]; then
echo "Update directory is empty. Skipping update"
else
versionsDirs=$(find $SCRIPTPATH/update/* -maxdepth 0 -type d | sort --version-sort)
current=$(cat $SCRIPTPATH/scroll-lock.json | jq -r .scroll_version)

for versionsDir in $versionsDirs
do
version=$(basename $versionsDir)
if [ ! "$(printf '%s\n' "$version" "$current" | sort -V | head -n1)" = "$version" ] ;
then
echo "$versionsDir/update.sh"
if [ -f "$versionsDir/update.sh" ]; then
sh $versionsDir/update.sh
else
echo "Warning: update $version has no update.sh... skipping"
fi
fi
done
fi



LATEST_VERSION=$(cat $SCRIPTPATH/scroll.yaml | yq -r .version)
jq --arg LV "$LATEST_VERSION" -r '.scroll_version = $LV' $SCRIPTPATH/scroll-lock.json | sponge $SCRIPTPATH/scroll-lock.json
Loading
Loading