From 144bf36483a3c077b9f56fe6c8efee8827b00cbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Schottst=C3=A4dt?= Date: Mon, 8 Jun 2026 20:35:51 +0200 Subject: [PATCH 1/2] fix: raise lgsm keepalive threshold --- scrolls/lgsm/.build/scroll.yaml.tmpl | 2 +- scrolls/lgsm/.build/vars.json | 1 + scrolls/lgsm/arkserver/scroll.yaml | 8 ++++---- scrolls/lgsm/cs2server/scroll.yaml | 4 ++-- scrolls/lgsm/csgoserver/scroll.yaml | 4 ++-- scrolls/lgsm/gmodserver/scroll.yaml | 4 ++-- scrolls/lgsm/sdtdserver/scroll.yaml | 4 ++-- scrolls/lgsm/untserver/scroll.yaml | 4 ++-- 8 files changed, 16 insertions(+), 15 deletions(-) diff --git a/scrolls/lgsm/.build/scroll.yaml.tmpl b/scrolls/lgsm/.build/scroll.yaml.tmpl index 5e29c915..daaaf780 100644 --- a/scrolls/lgsm/.build/scroll.yaml.tmpl +++ b/scrolls/lgsm/.build/scroll.yaml.tmpl @@ -18,7 +18,7 @@ ports: {{- end }} {{- end }} commands: -{{- $keepAliveTraffic := or .Vars.keep_alive_traffic "10kb/5m" }} +{{- $keepAliveTraffic := or .Vars.keep_alive_traffic "1mb/5m" }} console: needs: - start diff --git a/scrolls/lgsm/.build/vars.json b/scrolls/lgsm/.build/vars.json index 547fdd86..df44fd0f 100644 --- a/scrolls/lgsm/.build/vars.json +++ b/scrolls/lgsm/.build/vars.json @@ -61,6 +61,7 @@ "dayzserver": { "port": "main=2302/udp;battle-eye=2304/udp;query=27016/udp", "main_port_protocol": "udp", + "keep_alive_traffic": "10kb/5m", "lua_steam_app_id": "221100", "dependencies": "bc;binutils;bzip2;cpio;file;jq;pkgsi686Linux.gcc;netcat;pigz;python3;tmux;unzip;util-linux;moreutils;iproute2" }, diff --git a/scrolls/lgsm/arkserver/scroll.yaml b/scrolls/lgsm/arkserver/scroll.yaml index 3569e38a..69e24823 100644 --- a/scrolls/lgsm/arkserver/scroll.yaml +++ b/scrolls/lgsm/arkserver/scroll.yaml @@ -66,9 +66,9 @@ commands: image: artifacts.druid.gg/druid-team/druid:v0.1.248 expectedPorts: - name: query - keepAliveTraffic: 10kb/5m + keepAliveTraffic: 1mb/5m - name: main - keepAliveTraffic: 10kb/5m + keepAliveTraffic: 1mb/5m - name: rcon mounts: - path: "/runtime" @@ -91,9 +91,9 @@ commands: image: artifacts.druid.gg/druid-team/druid:v0.1.248-steamcmd expectedPorts: - name: query - keepAliveTraffic: 10kb/5m + keepAliveTraffic: 1mb/5m - name: main - keepAliveTraffic: 10kb/5m + keepAliveTraffic: 1mb/5m mounts: - path: "/server" working_dir: "/server" diff --git a/scrolls/lgsm/cs2server/scroll.yaml b/scrolls/lgsm/cs2server/scroll.yaml index f1656968..672f7602 100644 --- a/scrolls/lgsm/cs2server/scroll.yaml +++ b/scrolls/lgsm/cs2server/scroll.yaml @@ -76,7 +76,7 @@ commands: image: artifacts.druid.gg/druid-team/druid:v0.1.248 expectedPorts: - name: main - keepAliveTraffic: 10kb/5m + keepAliveTraffic: 1mb/5m mounts: - path: "/runtime" sub_path: "." @@ -97,7 +97,7 @@ commands: image: artifacts.druid.gg/druid-team/druid:v0.1.248-steamcmd expectedPorts: - name: main - keepAliveTraffic: 10kb/5m + keepAliveTraffic: 1mb/5m mounts: - path: "/server" working_dir: "/server" diff --git a/scrolls/lgsm/csgoserver/scroll.yaml b/scrolls/lgsm/csgoserver/scroll.yaml index 748c832a..84725e2e 100644 --- a/scrolls/lgsm/csgoserver/scroll.yaml +++ b/scrolls/lgsm/csgoserver/scroll.yaml @@ -28,7 +28,7 @@ commands: image: artifacts.druid.gg/druid-team/druid:v0.1.248 expectedPorts: - name: main - keepAliveTraffic: 10kb/5m + keepAliveTraffic: 1mb/5m mounts: - path: "/runtime" sub_path: "." @@ -49,7 +49,7 @@ commands: image: artifacts.druid.gg/druid-team/druid:v0.1.248-steamcmd expectedPorts: - name: main - keepAliveTraffic: 10kb/5m + keepAliveTraffic: 1mb/5m mounts: - path: "/server" working_dir: "/server" diff --git a/scrolls/lgsm/gmodserver/scroll.yaml b/scrolls/lgsm/gmodserver/scroll.yaml index 182052ec..7edb2687 100644 --- a/scrolls/lgsm/gmodserver/scroll.yaml +++ b/scrolls/lgsm/gmodserver/scroll.yaml @@ -28,7 +28,7 @@ commands: image: artifacts.druid.gg/druid-team/druid:v0.1.248 expectedPorts: - name: main - keepAliveTraffic: 10kb/5m + keepAliveTraffic: 1mb/5m mounts: - path: "/runtime" sub_path: "." @@ -52,7 +52,7 @@ commands: image: artifacts.druid.gg/druid-team/druid:v0.1.248-steamcmd expectedPorts: - name: main - keepAliveTraffic: 10kb/5m + keepAliveTraffic: 1mb/5m mounts: - path: "/server" working_dir: "/server" diff --git a/scrolls/lgsm/sdtdserver/scroll.yaml b/scrolls/lgsm/sdtdserver/scroll.yaml index d47b29ac..12c0b3a9 100644 --- a/scrolls/lgsm/sdtdserver/scroll.yaml +++ b/scrolls/lgsm/sdtdserver/scroll.yaml @@ -28,7 +28,7 @@ commands: image: artifacts.druid.gg/druid-team/druid:v0.1.248 expectedPorts: - name: main - keepAliveTraffic: 10kb/5m + keepAliveTraffic: 1mb/5m mounts: - path: "/runtime" sub_path: "." @@ -49,7 +49,7 @@ commands: image: artifacts.druid.gg/druid-team/druid:v0.1.248-steamcmd expectedPorts: - name: main - keepAliveTraffic: 10kb/5m + keepAliveTraffic: 1mb/5m mounts: - path: "/server" working_dir: "/server" diff --git a/scrolls/lgsm/untserver/scroll.yaml b/scrolls/lgsm/untserver/scroll.yaml index 826a2862..12da95fc 100644 --- a/scrolls/lgsm/untserver/scroll.yaml +++ b/scrolls/lgsm/untserver/scroll.yaml @@ -21,7 +21,7 @@ commands: image: artifacts.druid.gg/druid-team/druid:v0.1.248 expectedPorts: - name: main - keepAliveTraffic: 10kb/5m + keepAliveTraffic: 1mb/5m mounts: - path: "/runtime" sub_path: "." @@ -42,7 +42,7 @@ commands: image: artifacts.druid.gg/druid-team/druid:v0.1.248-steamcmd expectedPorts: - name: main - keepAliveTraffic: 10kb/5m + keepAliveTraffic: 1mb/5m mounts: - path: "/server" working_dir: "/server" From 84624982d41d53be4a0946fc826d35065033575f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Schottst=C3=A4dt?= Date: Mon, 8 Jun 2026 20:46:26 +0200 Subject: [PATCH 2/2] ci: scope scroll preview pushes --- .github/workflows/pr.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index d3c6387c..e1f02eb0 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -57,10 +57,22 @@ jobs: echo "No scroll source changes; skipping preview push." else echo "changed=true" >> "$GITHUB_OUTPUT" - echo "Scroll source changed; publishing previews." + roots="$( + git diff --name-only "origin/${{ github.base_ref }}"..HEAD -- scrolls \ + | awk -F/ '$1 == "scrolls" && $2 != "" && $3 != "" && $3 != ".build" && $3 != ".sample" { print "./"$1"/"$2"/"$3 }' \ + | sort -u \ + | tr '\n' ' ' + )" + echo "roots=${roots}" >> "$GITHUB_OUTPUT" + if [ -n "$roots" ]; then + echo "Scroll source changed; publishing previews for: ${roots}" + else + echo "Scroll source changed; publishing all previews." + fi fi - name: Push experimental PR tags if: github.event.pull_request.head.repo.full_name == github.repository && steps.scroll-changes.outputs.changed == 'true' env: SCROLL_REGISTRY_HOST: ${{ secrets.SCROLL_REGISTRY_HOST }} + SCROLL_PR_ROOTS: ${{ steps.scroll-changes.outputs.roots }} run: ./scripts/push.sh "${{ github.event.pull_request.number }}"