Skip to content

Commit 14ec8a4

Browse files
committed
Fix smoke test: Extract engine to workspace, put SpringBoard in games/
Simplified structure following standard Spring engine layout: - Extract engine to workspace root (./spring executable) - SpringBoard-Core checkout is already at workspace root - Symlink workspace as games/SpringBoard Core.sdd - Engine finds the game via games/ folder Structure: workspace/ (SpringBoard-Core checkout) ├── scen_edit/, LuaUI/, modinfo.lua, etc. ├── spring (extracted engine) ├── games/ │ └── SpringBoard Core.sdd -> .. (symlink to workspace) └── maps/ Much simpler - just download engine, put game archive in games/ folder.
1 parent a84118b commit 14ec8a4

File tree

1 file changed

+11
-17
lines changed

1 file changed

+11
-17
lines changed

.github/workflows/smoke-test.yml

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,18 @@ jobs:
3939
4040
- name: Download BAR Engine (with RmlUi support)
4141
run: |
42-
mkdir -p engine
43-
cd engine
4442
echo "Downloading BAR Engine 105.1.1-2472-ga5aa45c (supports RmlUi)..."
4543
wget -q "https://github.com/beyond-all-reason/spring/releases/download/spring_bar_%7BBAR105%7D105.1.1-2472-ga5aa45c/spring_bar_.BAR105.105.1.1-2472-ga5aa45c_linux-64-minimal-portable.7z"
46-
7z x "spring_bar_.BAR105.105.1.1-2472-ga5aa45c_linux-64-minimal-portable.7z" -o"bar-105"
44+
7z x "spring_bar_.BAR105.105.1.1-2472-ga5aa45c_linux-64-minimal-portable.7z"
4745
rm *.7z
48-
chmod +x bar-105/spring
49-
chmod +x bar-105/spring-headless || true
50-
chmod +x bar-105/spring-dedicated || true
51-
ls -lah bar-105/
52-
cd ..
46+
chmod +x spring
47+
chmod +x spring-headless || true
48+
chmod +x spring-dedicated || true
5349
54-
- name: Prepare SpringBoard game package
50+
- name: Put SpringBoard in engine's games folder
5551
run: |
56-
# SpringBoard-Core is already a valid Spring archive, just symlink it
52+
# SpringBoard-Core is already a valid Spring archive
53+
# Just symlink it into the engine's games/ folder
5754
mkdir -p games
5855
ln -s "$(pwd)" "games/SpringBoard Core.sdd"
5956
ls -lah games/
@@ -142,16 +139,13 @@ jobs:
142139
143140
- name: Run smoke test with Xvfb (tests LuaUI + RmlUi)
144141
run: |
145-
ENGINE_DIR="./engine/bar-105"
146-
147142
echo "Starting SpringBoard smoke test with virtual display..."
148-
echo "Engine: $ENGINE_DIR"
149143
echo "Using Xvfb to run full spring binary (loads LuaUI + RmlUi)"
150144
151145
# Run Spring with Xvfb (virtual X11 display) so LuaUI loads
152146
# This actually tests RmlUi initialization!
153147
timeout 10s xvfb-run -a -s "-screen 0 1024x768x24" \
154-
$ENGINE_DIR/spring --write-dir $(pwd)/test-data script.txt || EXIT_CODE=$?
148+
./spring --write-dir $(pwd)/test-data script.txt || EXIT_CODE=$?
155149
156150
# Exit codes:
157151
# 0 = clean exit (unlikely in 10s)
@@ -210,14 +204,14 @@ jobs:
210204
if: always()
211205
run: |
212206
echo "=== Engine information ==="
213-
./engine/bar-105/spring --version || true
207+
./spring --version || true
214208
echo ""
215209
echo "=== RmlUi check ==="
216-
if strings ./engine/bar-105/spring | grep -i rmlui; then
210+
if strings ./spring | grep -i rmlui; then
217211
echo "✓ RmlUi support detected in engine binary"
218212
else
219213
echo "⚠ Could not detect RmlUi in engine binary"
220214
fi
221215
echo ""
222216
echo "=== GL info ==="
223-
ldd ./engine/bar-105/spring | grep -i "gl\|sdl" || true
217+
ldd ./spring | grep -i "gl\|sdl" || true

0 commit comments

Comments
 (0)