Skip to content

fix(lgsm): stream SteamCMD progress without buffering #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IOHelpMe wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(lgsm): stream SteamCMD progress without buffering #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 15 additions & 0 deletions generate-scrolls_test.go
View file
Open in desktop

@druid-infra druid-infra Jul 27, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The template + generated YAML changes look consistent, but the new regression only spot-checks arkserver. Since this PR updates all LGSM variants, could we strengthen the test to iterate the generated LGSM scroll set (or otherwise assert the wrapper on every generated file)? That would match the repo’s generated-artifact pattern better and make future generator drift much harder to miss.

Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,21 @@ func TestGeneratedSharedPortsRemainConcrete(t *testing.T) {
}
}

func TestGeneratedLGSMDownloadCommandsAreLineBuffered(t *testing.T) {
scroll := readGeneratedScroll(t, "scrolls/lgsm/arkserver/scroll.yaml")

update := scroll.Commands["start"].Procedures[0].Command
if !slices.Equal(update, []string{"stdbuf", "-oL", "./arkserver", "update"}) {
t.Fatalf("ARK update command = %#v", update)
}

installProcedures := scroll.Commands["install"].Procedures
autoInstall := installProcedures[len(installProcedures)-1].Command
if !slices.Equal(autoInstall, []string{"stdbuf", "-oL", "./arkserver", "auto-install"}) {
t.Fatalf("ARK auto-install command = %#v", autoInstall)
}
}

type generatedScroll struct {
Ports []generatedPort `yaml:"ports"`
Commands map[string]generatedCommand `yaml:"commands"`
Expand Down
4 changes: 4 additions & 0 deletions scrolls/lgsm/.build/scroll.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,8 @@ commands:
- path: "/server"
working_dir: "/server"
command:
- stdbuf
- -oL
- ./{{ .Version }}
- update
{{- if .Vars.runtime_config_script }}
Expand Down Expand Up @@ -250,6 +252,8 @@ commands:
- path: "/server"
working_dir: "/server"
command:
- stdbuf
- -oL
- ./{{ .Version }}
- auto-install
{{- if eq .Vars.postinstall "enabled" }}
Expand Down
4 changes: 4 additions & 0 deletions scrolls/lgsm/arkserver/scroll.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ commands:
- path: "/server"
working_dir: "/server"
command:
- stdbuf
- -oL
- ./arkserver
- update
- image: artifacts.druid.gg/druid-team/druid:v0.1.256-steamcmd
Expand Down Expand Up @@ -205,6 +207,8 @@ commands:
- path: "/server"
working_dir: "/server"
command:
- stdbuf
- -oL
- ./arkserver
- auto-install
serve: console
4 changes: 4 additions & 0 deletions scrolls/lgsm/cs2server/scroll.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ commands:
- path: "/server"
working_dir: "/server"
command:
- stdbuf
- -oL
- ./cs2server
- update
- image: artifacts.druid.gg/druid-team/druid:v0.1.256-steamcmd
Expand Down Expand Up @@ -187,6 +189,8 @@ commands:
- path: "/server"
working_dir: "/server"
command:
- stdbuf
- -oL
- ./cs2server
- auto-install
- image: artifacts.druid.gg/druid-team/druid:v0.1.256-steamcmd
Expand Down
4 changes: 4 additions & 0 deletions scrolls/lgsm/csgoserver/scroll.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ commands:
- path: "/server"
working_dir: "/server"
command:
- stdbuf
- -oL
- ./csgoserver
- update
- image: artifacts.druid.gg/druid-team/druid:v0.1.256-steamcmd
Expand Down Expand Up @@ -139,6 +141,8 @@ commands:
- path: "/server"
working_dir: "/server"
command:
- stdbuf
- -oL
- ./csgoserver
- auto-install
serve: console
4 changes: 4 additions & 0 deletions scrolls/lgsm/dayzserver/scroll.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ commands:
- path: "/server"
working_dir: "/server"
command:
- stdbuf
- -oL
- ./dayzserver
- update
- image: artifacts.druid.gg/druid-team/druid:v0.1.256-steamcmd
Expand Down Expand Up @@ -128,6 +130,8 @@ commands:
- path: "/server"
working_dir: "/server"
command:
- stdbuf
- -oL
- ./dayzserver
- auto-install
serve: console
4 changes: 4 additions & 0 deletions scrolls/lgsm/gmodserver/scroll.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ commands:
- path: "/server"
working_dir: "/server"
command:
- stdbuf
- -oL
- ./gmodserver
- update
- image: artifacts.druid.gg/druid-team/druid:v0.1.256-steamcmd
Expand Down Expand Up @@ -141,6 +143,8 @@ commands:
- path: "/server"
working_dir: "/server"
command:
- stdbuf
- -oL
- ./gmodserver
- auto-install
serve: console
4 changes: 4 additions & 0 deletions scrolls/lgsm/pwserver/scroll.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ commands:
- path: "/server"
working_dir: "/server"
command:
- stdbuf
- -oL
- ./pwserver
- update
- image: artifacts.druid.gg/druid-team/druid:v0.1.256-steamcmd
Expand Down Expand Up @@ -125,6 +127,8 @@ commands:
- path: "/server"
working_dir: "/server"
command:
- stdbuf
- -oL
- ./pwserver
- auto-install
serve: console
4 changes: 4 additions & 0 deletions scrolls/lgsm/pzserver/scroll.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ commands:
- path: "/server"
working_dir: "/server"
command:
- stdbuf
- -oL
- ./pzserver
- update
- image: artifacts.druid.gg/druid-team/druid:v0.1.256-steamcmd
Expand Down Expand Up @@ -169,6 +171,8 @@ commands:
- path: "/server"
working_dir: "/server"
command:
- stdbuf
- -oL
- ./pzserver
- auto-install
serve: console
4 changes: 4 additions & 0 deletions scrolls/lgsm/sdtdserver/scroll.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ commands:
- path: "/server"
working_dir: "/server"
command:
- stdbuf
- -oL
- ./sdtdserver
- update
- image: artifacts.druid.gg/druid-team/druid:v0.1.256-steamcmd
Expand Down Expand Up @@ -139,6 +141,8 @@ commands:
- path: "/server"
working_dir: "/server"
command:
- stdbuf
- -oL
- ./sdtdserver
- auto-install
serve: console
4 changes: 4 additions & 0 deletions scrolls/lgsm/untserver/scroll.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ commands:
- path: "/server"
working_dir: "/server"
command:
- stdbuf
- -oL
- ./untserver
- update
- image: artifacts.druid.gg/druid-team/druid:v0.1.256-steamcmd
Expand Down Expand Up @@ -131,6 +133,8 @@ commands:
- path: "/server"
working_dir: "/server"
command:
- stdbuf
- -oL
- ./untserver
- auto-install
serve: console
Loading